forked from distok/cutthecord
Compare commits
No commits in common. "38badc85d8b2290ca8d4ac871f57b9ff795ea5ee" and "50b3f050c4b42c00d31e9fd125ea29a0a7e6d413" have entirely different histories.
38badc85d8
...
50b3f050c4
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
Modular Client Mod for Discord's Android app.
|
||||
|
||||
**Latest supported Discord Android version:** 10.2.9 (1029), released on 2020-01-28.
|
||||
**Latest supported Discord Android version:** 9.9.2 (992), released on 2019-11-26.
|
||||
|
||||
New patch development will be done for the latest supported version.
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
import os
|
||||
import sys
|
||||
import shutil
|
||||
import requests
|
||||
import json
|
||||
import subprocess
|
||||
from ctcconfig import *
|
||||
|
|
@ -232,9 +231,9 @@ APK_PATH = os.path.join(WORK_FOLDER, "discord",
|
|||
|
||||
# Sign the APK
|
||||
if DO_APKSIGNER:
|
||||
subprocess.run(f"apksigner sign --ks {KEYSTORE_FILE} "
|
||||
subprocess.run(f"apksigner sign --ks {KEYSTORE_FILE}"
|
||||
f"--ks-key-alias {KEYSTORE_ALIAS} "
|
||||
f"--ks-pass pass:{KEYSTORE_PASS} "
|
||||
f"--ks-pass pass:{KEYSTORE_PASS}"
|
||||
f"{APK_PATH}",
|
||||
shell=True,
|
||||
cwd=WORK_FOLDER)
|
||||
|
|
|
|||
|
|
@ -7,5 +7,3 @@ Here's why these patches are no longer maintained in this form:
|
|||
- notyping: Moved into slashcommands as a slash command
|
||||
- pureevil: It's now upstream (yay.)
|
||||
- compact: It's just a pain to maintain.
|
||||
- smalltime: It's just a pain to maintain.
|
||||
- customdefaultemoji: There doesn't seem to be default emojis anymore?
|
||||
|
|
|
|||
|
|
@ -1,43 +0,0 @@
|
|||
diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali
|
||||
*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300
|
||||
--- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300
|
||||
***************
|
||||
*** 97,113 ****
|
||||
|
||||
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
|
||||
|
||||
! const-string v2, "thinking"
|
||||
|
||||
! const-string v3, "ok_hand"
|
||||
|
||||
! const-string v4, "eyes"
|
||||
|
||||
! const-string v5, "sweat_drops"
|
||||
|
||||
! const-string v6, "joy"
|
||||
|
||||
! const-string v7, "pig"
|
||||
|
||||
.line 350
|
||||
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
|
||||
--- 97,113 ----
|
||||
|
||||
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
|
||||
|
||||
! const-string v2, "star"
|
||||
|
||||
! const-string v3, "thinking"
|
||||
|
||||
! const-string v4, "ok_hand"
|
||||
|
||||
! const-string v5, "eyes"
|
||||
|
||||
! const-string v6, "sweat_drops"
|
||||
|
||||
! const-string v7, "joy"
|
||||
|
||||
.line 350
|
||||
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
|
||||
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig
|
||||
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej
|
||||
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali
|
||||
*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300
|
||||
--- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300
|
||||
***************
|
||||
*** 97,113 ****
|
||||
|
||||
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
|
||||
|
||||
! const-string v2, "thinking"
|
||||
|
||||
! const-string v3, "ok_hand"
|
||||
|
||||
! const-string v4, "eyes"
|
||||
|
||||
! const-string v5, "sweat_drops"
|
||||
|
||||
! const-string v6, "joy"
|
||||
|
||||
! const-string v7, "pig"
|
||||
|
||||
.line 350
|
||||
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
|
||||
--- 97,113 ----
|
||||
|
||||
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
|
||||
|
||||
! const-string v2, "star"
|
||||
|
||||
! const-string v3, "thinking"
|
||||
|
||||
! const-string v4, "ok_hand"
|
||||
|
||||
! const-string v5, "eyes"
|
||||
|
||||
! const-string v6, "sweat_drops"
|
||||
|
||||
! const-string v7, "joy"
|
||||
|
||||
.line 350
|
||||
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
|
||||
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig
|
||||
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej
|
||||
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali
|
||||
*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300
|
||||
--- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300
|
||||
***************
|
||||
*** 97,113 ****
|
||||
|
||||
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
|
||||
|
||||
! const-string v2, "thinking"
|
||||
|
||||
! const-string v3, "ok_hand"
|
||||
|
||||
! const-string v4, "eyes"
|
||||
|
||||
! const-string v5, "sweat_drops"
|
||||
|
||||
! const-string v6, "joy"
|
||||
|
||||
! const-string v7, "pig"
|
||||
|
||||
.line 350
|
||||
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
|
||||
--- 97,113 ----
|
||||
|
||||
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
|
||||
|
||||
! const-string v2, "star"
|
||||
|
||||
! const-string v3, "thinking"
|
||||
|
||||
! const-string v4, "ok_hand"
|
||||
|
||||
! const-string v5, "eyes"
|
||||
|
||||
! const-string v6, "sweat_drops"
|
||||
|
||||
! const-string v7, "joy"
|
||||
|
||||
.line 350
|
||||
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
|
||||
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig
|
||||
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej
|
||||
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali
|
||||
*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300
|
||||
--- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300
|
||||
***************
|
||||
*** 97,113 ****
|
||||
|
||||
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
|
||||
|
||||
! const-string v2, "thinking"
|
||||
|
||||
! const-string v3, "ok_hand"
|
||||
|
||||
! const-string v4, "eyes"
|
||||
|
||||
! const-string v5, "sweat_drops"
|
||||
|
||||
! const-string v6, "joy"
|
||||
|
||||
! const-string v7, "pig"
|
||||
|
||||
.line 350
|
||||
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
|
||||
--- 97,113 ----
|
||||
|
||||
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
|
||||
|
||||
! const-string v2, "star"
|
||||
|
||||
! const-string v3, "thinking"
|
||||
|
||||
! const-string v4, "ok_hand"
|
||||
|
||||
! const-string v5, "eyes"
|
||||
|
||||
! const-string v6, "sweat_drops"
|
||||
|
||||
! const-string v7, "joy"
|
||||
|
||||
.line 350
|
||||
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
|
||||
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig
|
||||
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej
|
||||
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali
|
||||
*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300
|
||||
--- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300
|
||||
***************
|
||||
*** 97,113 ****
|
||||
|
||||
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
|
||||
|
||||
! const-string v2, "thinking"
|
||||
|
||||
! const-string v3, "ok_hand"
|
||||
|
||||
! const-string v4, "eyes"
|
||||
|
||||
! const-string v5, "sweat_drops"
|
||||
|
||||
! const-string v6, "joy"
|
||||
|
||||
! const-string v7, "pig"
|
||||
|
||||
.line 350
|
||||
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
|
||||
--- 97,113 ----
|
||||
|
||||
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
|
||||
|
||||
! const-string v2, "star"
|
||||
|
||||
! const-string v3, "thinking"
|
||||
|
||||
! const-string v4, "ok_hand"
|
||||
|
||||
! const-string v5, "eyes"
|
||||
|
||||
! const-string v6, "sweat_drops"
|
||||
|
||||
! const-string v7, "joy"
|
||||
|
||||
.line 350
|
||||
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
|
||||
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig
|
||||
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej
|
||||
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
diff -crB from/smali/com/discord/stores/StoreEmoji.smali to/smali/com/discord/stores/StoreEmoji.smali
|
||||
*** from/smali/com/discord/stores/StoreEmoji.smali 2019-11-14 22:32:21.079850865 +0300
|
||||
--- to/smali/com/discord/stores/StoreEmoji.smali 2019-11-14 22:33:18.846833515 +0300
|
||||
***************
|
||||
*** 103,139 ****
|
||||
|
||||
const/4 v1, 0x0
|
||||
|
||||
! const-string v2, "thinking"
|
||||
|
||||
aput-object v2, v0, v1
|
||||
|
||||
const/4 v1, 0x1
|
||||
|
||||
! const-string v2, "ok_hand"
|
||||
|
||||
aput-object v2, v0, v1
|
||||
|
||||
const/4 v1, 0x2
|
||||
|
||||
! const-string v2, "eyes"
|
||||
|
||||
aput-object v2, v0, v1
|
||||
|
||||
const/4 v1, 0x3
|
||||
|
||||
! const-string v2, "sweat_drops"
|
||||
|
||||
aput-object v2, v0, v1
|
||||
|
||||
const/4 v1, 0x4
|
||||
|
||||
! const-string v2, "joy"
|
||||
|
||||
aput-object v2, v0, v1
|
||||
|
||||
const/4 v1, 0x5
|
||||
|
||||
! const-string v2, "pig"
|
||||
|
||||
aput-object v2, v0, v1
|
||||
|
||||
--- 103,139 ----
|
||||
|
||||
const/4 v1, 0x0
|
||||
|
||||
! const-string v2, "star"
|
||||
|
||||
aput-object v2, v0, v1
|
||||
|
||||
const/4 v1, 0x1
|
||||
|
||||
! const-string v2, "thinking"
|
||||
|
||||
aput-object v2, v0, v1
|
||||
|
||||
const/4 v1, 0x2
|
||||
|
||||
! const-string v2, "ok_hand"
|
||||
|
||||
aput-object v2, v0, v1
|
||||
|
||||
const/4 v1, 0x3
|
||||
|
||||
! const-string v2, "eyes"
|
||||
|
||||
aput-object v2, v0, v1
|
||||
|
||||
const/4 v1, 0x4
|
||||
|
||||
! const-string v2, "sweat_drops"
|
||||
|
||||
aput-object v2, v0, v1
|
||||
|
||||
const/4 v1, 0x5
|
||||
|
||||
! const-string v2, "joy"
|
||||
|
||||
aput-object v2, v0, v1
|
||||
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali
|
||||
*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300
|
||||
--- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300
|
||||
***************
|
||||
*** 97,113 ****
|
||||
|
||||
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
|
||||
|
||||
! const-string v2, "thinking"
|
||||
|
||||
! const-string v3, "ok_hand"
|
||||
|
||||
! const-string v4, "eyes"
|
||||
|
||||
! const-string v5, "sweat_drops"
|
||||
|
||||
! const-string v6, "joy"
|
||||
|
||||
! const-string v7, "pig"
|
||||
|
||||
.line 350
|
||||
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
|
||||
--- 97,113 ----
|
||||
|
||||
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
|
||||
|
||||
! const-string v2, "star"
|
||||
|
||||
! const-string v3, "thinking"
|
||||
|
||||
! const-string v4, "ok_hand"
|
||||
|
||||
! const-string v5, "eyes"
|
||||
|
||||
! const-string v6, "sweat_drops"
|
||||
|
||||
! const-string v7, "joy"
|
||||
|
||||
.line 350
|
||||
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
|
||||
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig
|
||||
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej
|
||||
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali
|
||||
*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300
|
||||
--- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300
|
||||
***************
|
||||
*** 97,113 ****
|
||||
|
||||
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
|
||||
|
||||
! const-string v2, "thinking"
|
||||
|
||||
! const-string v3, "ok_hand"
|
||||
|
||||
! const-string v4, "eyes"
|
||||
|
||||
! const-string v5, "sweat_drops"
|
||||
|
||||
! const-string v6, "joy"
|
||||
|
||||
! const-string v7, "pig"
|
||||
|
||||
.line 350
|
||||
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
|
||||
--- 97,113 ----
|
||||
|
||||
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
|
||||
|
||||
! const-string v2, "star"
|
||||
|
||||
! const-string v3, "thinking"
|
||||
|
||||
! const-string v4, "ok_hand"
|
||||
|
||||
! const-string v5, "eyes"
|
||||
|
||||
! const-string v6, "sweat_drops"
|
||||
|
||||
! const-string v7, "joy"
|
||||
|
||||
.line 350
|
||||
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
|
||||
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig
|
||||
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej
|
||||
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali
|
||||
*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300
|
||||
--- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300
|
||||
***************
|
||||
*** 97,113 ****
|
||||
|
||||
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
|
||||
|
||||
! const-string v2, "thinking"
|
||||
|
||||
! const-string v3, "ok_hand"
|
||||
|
||||
! const-string v4, "eyes"
|
||||
|
||||
! const-string v5, "sweat_drops"
|
||||
|
||||
! const-string v6, "joy"
|
||||
|
||||
! const-string v7, "pig"
|
||||
|
||||
.line 350
|
||||
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
|
||||
--- 97,113 ----
|
||||
|
||||
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
|
||||
|
||||
! const-string v2, "star"
|
||||
|
||||
! const-string v3, "thinking"
|
||||
|
||||
! const-string v4, "ok_hand"
|
||||
|
||||
! const-string v5, "eyes"
|
||||
|
||||
! const-string v6, "sweat_drops"
|
||||
|
||||
! const-string v7, "joy"
|
||||
|
||||
.line 350
|
||||
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
|
||||
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig
|
||||
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej
|
||||
|
||||
|
|
@ -1,190 +0,0 @@
|
|||
diff -crB from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali
|
||||
*** from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:13:48.187878981 +0300
|
||||
--- to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:15:32.663889927 +0300
|
||||
***************
|
||||
*** 239,411 ****
|
||||
.end method
|
||||
|
||||
.method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String;
|
||||
! .locals 6
|
||||
!
|
||||
! .line 126
|
||||
! invoke-virtual {p0}, Lcom/miguelgaeta/simple_time/SimpleTime;->currentTimeMillis()J
|
||||
!
|
||||
! move-result-wide v0
|
||||
!
|
||||
! invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! invoke-virtual {p0, v0}, Lcom/miguelgaeta/simple_time/SimpleTime;->toCalendar(Ljava/lang/Long;)Ljava/util/Calendar;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! const/4 v1, 0x0
|
||||
!
|
||||
! const/16 v2, 0xb
|
||||
!
|
||||
! .line 128
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! const/16 v2, 0xc
|
||||
!
|
||||
! .line 129
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! const/16 v2, 0xd
|
||||
!
|
||||
! .line 130
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! const/16 v2, 0xe
|
||||
!
|
||||
! .line 131
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! .line 133
|
||||
! iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->locale:Ljava/util/Locale;
|
||||
!
|
||||
! invoke-virtual {v1}, Ljava/util/Locale;->getLanguage()Ljava/lang/String;
|
||||
!
|
||||
! move-result-object v1
|
||||
!
|
||||
! const-string v2, "en"
|
||||
!
|
||||
! invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
|
||||
!
|
||||
! move-result v1
|
||||
!
|
||||
! if-nez v1, :cond_1
|
||||
!
|
||||
! .line 136
|
||||
! invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
|
||||
!
|
||||
! move-result-wide v1
|
||||
!
|
||||
! invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
|
||||
!
|
||||
! move-result-wide v3
|
||||
!
|
||||
! cmp-long v0, v1, v3
|
||||
!
|
||||
! if-lez v0, :cond_0
|
||||
!
|
||||
! .line 137
|
||||
iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
|
||||
invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- .line 139
|
||||
- :cond_0
|
||||
- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- .line 143
|
||||
- :cond_1
|
||||
- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
|
||||
-
|
||||
- move-result-wide v1
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
|
||||
-
|
||||
- move-result-wide v3
|
||||
-
|
||||
- cmp-long v5, v1, v3
|
||||
-
|
||||
- if-lez v5, :cond_2
|
||||
-
|
||||
- .line 144
|
||||
- new-instance v0, Ljava/lang/StringBuilder;
|
||||
-
|
||||
- const-string v1, "Today at "
|
||||
-
|
||||
- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||
-
|
||||
- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- :cond_2
|
||||
- const/4 v1, 0x5
|
||||
-
|
||||
- const/4 v2, -0x1
|
||||
-
|
||||
- .line 147
|
||||
- invoke-virtual {v0, v1, v2}, Ljava/util/Calendar;->add(II)V
|
||||
-
|
||||
- .line 149
|
||||
- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
|
||||
-
|
||||
- move-result-wide v1
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
|
||||
-
|
||||
- move-result-wide v3
|
||||
-
|
||||
- cmp-long v0, v1, v3
|
||||
-
|
||||
- if-lez v0, :cond_3
|
||||
-
|
||||
- .line 150
|
||||
- new-instance v0, Ljava/lang/StringBuilder;
|
||||
-
|
||||
- const-string v1, "Yesterday at "
|
||||
-
|
||||
- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||
-
|
||||
- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- .line 153
|
||||
- :cond_3
|
||||
- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
move-result-object p1
|
||||
|
||||
return-object p1
|
||||
--- 239,249 ----
|
||||
.end method
|
||||
|
||||
.method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String;
|
||||
! .locals 1
|
||||
iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
|
||||
invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
|
||||
move-result-object p1
|
||||
|
||||
return-object p1
|
||||
|
|
@ -1,190 +0,0 @@
|
|||
diff -crB from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali
|
||||
*** from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:13:48.187878981 +0300
|
||||
--- to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:15:32.663889927 +0300
|
||||
***************
|
||||
*** 239,411 ****
|
||||
.end method
|
||||
|
||||
.method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String;
|
||||
! .locals 6
|
||||
!
|
||||
! .line 126
|
||||
! invoke-virtual {p0}, Lcom/miguelgaeta/simple_time/SimpleTime;->currentTimeMillis()J
|
||||
!
|
||||
! move-result-wide v0
|
||||
!
|
||||
! invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! invoke-virtual {p0, v0}, Lcom/miguelgaeta/simple_time/SimpleTime;->toCalendar(Ljava/lang/Long;)Ljava/util/Calendar;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! const/4 v1, 0x0
|
||||
!
|
||||
! const/16 v2, 0xb
|
||||
!
|
||||
! .line 128
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! const/16 v2, 0xc
|
||||
!
|
||||
! .line 129
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! const/16 v2, 0xd
|
||||
!
|
||||
! .line 130
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! const/16 v2, 0xe
|
||||
!
|
||||
! .line 131
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! .line 133
|
||||
! iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->locale:Ljava/util/Locale;
|
||||
!
|
||||
! invoke-virtual {v1}, Ljava/util/Locale;->getLanguage()Ljava/lang/String;
|
||||
!
|
||||
! move-result-object v1
|
||||
!
|
||||
! const-string v2, "en"
|
||||
!
|
||||
! invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
|
||||
!
|
||||
! move-result v1
|
||||
!
|
||||
! if-nez v1, :cond_1
|
||||
!
|
||||
! .line 136
|
||||
! invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
|
||||
!
|
||||
! move-result-wide v1
|
||||
!
|
||||
! invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
|
||||
!
|
||||
! move-result-wide v3
|
||||
!
|
||||
! cmp-long v0, v1, v3
|
||||
!
|
||||
! if-lez v0, :cond_0
|
||||
!
|
||||
! .line 137
|
||||
iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
|
||||
invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- .line 139
|
||||
- :cond_0
|
||||
- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- .line 143
|
||||
- :cond_1
|
||||
- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
|
||||
-
|
||||
- move-result-wide v1
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
|
||||
-
|
||||
- move-result-wide v3
|
||||
-
|
||||
- cmp-long v5, v1, v3
|
||||
-
|
||||
- if-lez v5, :cond_2
|
||||
-
|
||||
- .line 144
|
||||
- new-instance v0, Ljava/lang/StringBuilder;
|
||||
-
|
||||
- const-string v1, "Today at "
|
||||
-
|
||||
- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||
-
|
||||
- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- :cond_2
|
||||
- const/4 v1, 0x5
|
||||
-
|
||||
- const/4 v2, -0x1
|
||||
-
|
||||
- .line 147
|
||||
- invoke-virtual {v0, v1, v2}, Ljava/util/Calendar;->add(II)V
|
||||
-
|
||||
- .line 149
|
||||
- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
|
||||
-
|
||||
- move-result-wide v1
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
|
||||
-
|
||||
- move-result-wide v3
|
||||
-
|
||||
- cmp-long v0, v1, v3
|
||||
-
|
||||
- if-lez v0, :cond_3
|
||||
-
|
||||
- .line 150
|
||||
- new-instance v0, Ljava/lang/StringBuilder;
|
||||
-
|
||||
- const-string v1, "Yesterday at "
|
||||
-
|
||||
- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||
-
|
||||
- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- .line 153
|
||||
- :cond_3
|
||||
- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
move-result-object p1
|
||||
|
||||
return-object p1
|
||||
--- 239,249 ----
|
||||
.end method
|
||||
|
||||
.method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String;
|
||||
! .locals 1
|
||||
iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
|
||||
invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
|
||||
move-result-object p1
|
||||
|
||||
return-object p1
|
||||
|
|
@ -1,190 +0,0 @@
|
|||
diff -crB from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali
|
||||
*** from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:13:48.187878981 +0300
|
||||
--- to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:15:32.663889927 +0300
|
||||
***************
|
||||
*** 239,411 ****
|
||||
.end method
|
||||
|
||||
.method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String;
|
||||
! .locals 6
|
||||
!
|
||||
! .line 126
|
||||
! invoke-virtual {p0}, Lcom/miguelgaeta/simple_time/SimpleTime;->currentTimeMillis()J
|
||||
!
|
||||
! move-result-wide v0
|
||||
!
|
||||
! invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! invoke-virtual {p0, v0}, Lcom/miguelgaeta/simple_time/SimpleTime;->toCalendar(Ljava/lang/Long;)Ljava/util/Calendar;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! const/4 v1, 0x0
|
||||
!
|
||||
! const/16 v2, 0xb
|
||||
!
|
||||
! .line 128
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! const/16 v2, 0xc
|
||||
!
|
||||
! .line 129
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! const/16 v2, 0xd
|
||||
!
|
||||
! .line 130
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! const/16 v2, 0xe
|
||||
!
|
||||
! .line 131
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! .line 133
|
||||
! iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->locale:Ljava/util/Locale;
|
||||
!
|
||||
! invoke-virtual {v1}, Ljava/util/Locale;->getLanguage()Ljava/lang/String;
|
||||
!
|
||||
! move-result-object v1
|
||||
!
|
||||
! const-string v2, "en"
|
||||
!
|
||||
! invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
|
||||
!
|
||||
! move-result v1
|
||||
!
|
||||
! if-nez v1, :cond_1
|
||||
!
|
||||
! .line 136
|
||||
! invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
|
||||
!
|
||||
! move-result-wide v1
|
||||
!
|
||||
! invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
|
||||
!
|
||||
! move-result-wide v3
|
||||
!
|
||||
! cmp-long v0, v1, v3
|
||||
!
|
||||
! if-lez v0, :cond_0
|
||||
!
|
||||
! .line 137
|
||||
iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
|
||||
invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- .line 139
|
||||
- :cond_0
|
||||
- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- .line 143
|
||||
- :cond_1
|
||||
- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
|
||||
-
|
||||
- move-result-wide v1
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
|
||||
-
|
||||
- move-result-wide v3
|
||||
-
|
||||
- cmp-long v5, v1, v3
|
||||
-
|
||||
- if-lez v5, :cond_2
|
||||
-
|
||||
- .line 144
|
||||
- new-instance v0, Ljava/lang/StringBuilder;
|
||||
-
|
||||
- const-string v1, "Today at "
|
||||
-
|
||||
- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||
-
|
||||
- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- :cond_2
|
||||
- const/4 v1, 0x5
|
||||
-
|
||||
- const/4 v2, -0x1
|
||||
-
|
||||
- .line 147
|
||||
- invoke-virtual {v0, v1, v2}, Ljava/util/Calendar;->add(II)V
|
||||
-
|
||||
- .line 149
|
||||
- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
|
||||
-
|
||||
- move-result-wide v1
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
|
||||
-
|
||||
- move-result-wide v3
|
||||
-
|
||||
- cmp-long v0, v1, v3
|
||||
-
|
||||
- if-lez v0, :cond_3
|
||||
-
|
||||
- .line 150
|
||||
- new-instance v0, Ljava/lang/StringBuilder;
|
||||
-
|
||||
- const-string v1, "Yesterday at "
|
||||
-
|
||||
- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||
-
|
||||
- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- .line 153
|
||||
- :cond_3
|
||||
- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
move-result-object p1
|
||||
|
||||
return-object p1
|
||||
--- 239,249 ----
|
||||
.end method
|
||||
|
||||
.method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String;
|
||||
! .locals 1
|
||||
iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
|
||||
invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
|
||||
move-result-object p1
|
||||
|
||||
return-object p1
|
||||
|
|
@ -1,190 +0,0 @@
|
|||
diff -crB from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali
|
||||
*** from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:13:48.187878981 +0300
|
||||
--- to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:15:32.663889927 +0300
|
||||
***************
|
||||
*** 239,411 ****
|
||||
.end method
|
||||
|
||||
.method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String;
|
||||
! .locals 6
|
||||
!
|
||||
! .line 126
|
||||
! invoke-virtual {p0}, Lcom/miguelgaeta/simple_time/SimpleTime;->currentTimeMillis()J
|
||||
!
|
||||
! move-result-wide v0
|
||||
!
|
||||
! invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! invoke-virtual {p0, v0}, Lcom/miguelgaeta/simple_time/SimpleTime;->toCalendar(Ljava/lang/Long;)Ljava/util/Calendar;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! const/4 v1, 0x0
|
||||
!
|
||||
! const/16 v2, 0xb
|
||||
!
|
||||
! .line 128
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! const/16 v2, 0xc
|
||||
!
|
||||
! .line 129
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! const/16 v2, 0xd
|
||||
!
|
||||
! .line 130
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! const/16 v2, 0xe
|
||||
!
|
||||
! .line 131
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! .line 133
|
||||
! iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->locale:Ljava/util/Locale;
|
||||
!
|
||||
! invoke-virtual {v1}, Ljava/util/Locale;->getLanguage()Ljava/lang/String;
|
||||
!
|
||||
! move-result-object v1
|
||||
!
|
||||
! const-string v2, "en"
|
||||
!
|
||||
! invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
|
||||
!
|
||||
! move-result v1
|
||||
!
|
||||
! if-nez v1, :cond_1
|
||||
!
|
||||
! .line 136
|
||||
! invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
|
||||
!
|
||||
! move-result-wide v1
|
||||
!
|
||||
! invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
|
||||
!
|
||||
! move-result-wide v3
|
||||
!
|
||||
! cmp-long v0, v1, v3
|
||||
!
|
||||
! if-lez v0, :cond_0
|
||||
!
|
||||
! .line 137
|
||||
iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
|
||||
invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- .line 139
|
||||
- :cond_0
|
||||
- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- .line 143
|
||||
- :cond_1
|
||||
- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
|
||||
-
|
||||
- move-result-wide v1
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
|
||||
-
|
||||
- move-result-wide v3
|
||||
-
|
||||
- cmp-long v5, v1, v3
|
||||
-
|
||||
- if-lez v5, :cond_2
|
||||
-
|
||||
- .line 144
|
||||
- new-instance v0, Ljava/lang/StringBuilder;
|
||||
-
|
||||
- const-string v1, "Today at "
|
||||
-
|
||||
- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||
-
|
||||
- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- :cond_2
|
||||
- const/4 v1, 0x5
|
||||
-
|
||||
- const/4 v2, -0x1
|
||||
-
|
||||
- .line 147
|
||||
- invoke-virtual {v0, v1, v2}, Ljava/util/Calendar;->add(II)V
|
||||
-
|
||||
- .line 149
|
||||
- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
|
||||
-
|
||||
- move-result-wide v1
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
|
||||
-
|
||||
- move-result-wide v3
|
||||
-
|
||||
- cmp-long v0, v1, v3
|
||||
-
|
||||
- if-lez v0, :cond_3
|
||||
-
|
||||
- .line 150
|
||||
- new-instance v0, Ljava/lang/StringBuilder;
|
||||
-
|
||||
- const-string v1, "Yesterday at "
|
||||
-
|
||||
- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||
-
|
||||
- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- .line 153
|
||||
- :cond_3
|
||||
- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
move-result-object p1
|
||||
|
||||
return-object p1
|
||||
--- 239,249 ----
|
||||
.end method
|
||||
|
||||
.method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String;
|
||||
! .locals 1
|
||||
iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
|
||||
invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
|
||||
move-result-object p1
|
||||
|
||||
return-object p1
|
||||
|
|
@ -1,190 +0,0 @@
|
|||
diff -crB from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali
|
||||
*** from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:13:48.187878981 +0300
|
||||
--- to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:15:32.663889927 +0300
|
||||
***************
|
||||
*** 239,411 ****
|
||||
.end method
|
||||
|
||||
.method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String;
|
||||
! .locals 6
|
||||
!
|
||||
! .line 126
|
||||
! invoke-virtual {p0}, Lcom/miguelgaeta/simple_time/SimpleTime;->currentTimeMillis()J
|
||||
!
|
||||
! move-result-wide v0
|
||||
!
|
||||
! invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! invoke-virtual {p0, v0}, Lcom/miguelgaeta/simple_time/SimpleTime;->toCalendar(Ljava/lang/Long;)Ljava/util/Calendar;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! const/4 v1, 0x0
|
||||
!
|
||||
! const/16 v2, 0xb
|
||||
!
|
||||
! .line 128
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! const/16 v2, 0xc
|
||||
!
|
||||
! .line 129
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! const/16 v2, 0xd
|
||||
!
|
||||
! .line 130
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! const/16 v2, 0xe
|
||||
!
|
||||
! .line 131
|
||||
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
|
||||
!
|
||||
! .line 133
|
||||
! iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->locale:Ljava/util/Locale;
|
||||
!
|
||||
! invoke-virtual {v1}, Ljava/util/Locale;->getLanguage()Ljava/lang/String;
|
||||
!
|
||||
! move-result-object v1
|
||||
!
|
||||
! const-string v2, "en"
|
||||
!
|
||||
! invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
|
||||
!
|
||||
! move-result v1
|
||||
!
|
||||
! if-nez v1, :cond_1
|
||||
!
|
||||
! .line 136
|
||||
! invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
|
||||
!
|
||||
! move-result-wide v1
|
||||
!
|
||||
! invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
|
||||
!
|
||||
! move-result-wide v3
|
||||
!
|
||||
! cmp-long v0, v1, v3
|
||||
!
|
||||
! if-lez v0, :cond_0
|
||||
!
|
||||
! .line 137
|
||||
iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
|
||||
invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- .line 139
|
||||
- :cond_0
|
||||
- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- .line 143
|
||||
- :cond_1
|
||||
- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
|
||||
-
|
||||
- move-result-wide v1
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
|
||||
-
|
||||
- move-result-wide v3
|
||||
-
|
||||
- cmp-long v5, v1, v3
|
||||
-
|
||||
- if-lez v5, :cond_2
|
||||
-
|
||||
- .line 144
|
||||
- new-instance v0, Ljava/lang/StringBuilder;
|
||||
-
|
||||
- const-string v1, "Today at "
|
||||
-
|
||||
- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||
-
|
||||
- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- :cond_2
|
||||
- const/4 v1, 0x5
|
||||
-
|
||||
- const/4 v2, -0x1
|
||||
-
|
||||
- .line 147
|
||||
- invoke-virtual {v0, v1, v2}, Ljava/util/Calendar;->add(II)V
|
||||
-
|
||||
- .line 149
|
||||
- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
|
||||
-
|
||||
- move-result-wide v1
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
|
||||
-
|
||||
- move-result-wide v3
|
||||
-
|
||||
- cmp-long v0, v1, v3
|
||||
-
|
||||
- if-lez v0, :cond_3
|
||||
-
|
||||
- .line 150
|
||||
- new-instance v0, Ljava/lang/StringBuilder;
|
||||
-
|
||||
- const-string v1, "Yesterday at "
|
||||
-
|
||||
- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
|
||||
-
|
||||
- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
-
|
||||
- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
||||
-
|
||||
- move-result-object p1
|
||||
-
|
||||
- return-object p1
|
||||
-
|
||||
- .line 153
|
||||
- :cond_3
|
||||
- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat;
|
||||
-
|
||||
- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
-
|
||||
move-result-object p1
|
||||
|
||||
return-object p1
|
||||
--- 239,249 ----
|
||||
.end method
|
||||
|
||||
.method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String;
|
||||
! .locals 1
|
||||
iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
|
||||
|
||||
invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
|
||||
|
||||
move-result-object p1
|
||||
|
||||
return-object p1
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
#!/bin/bash
|
||||
\cp "$1/emoji_2122_fe0f.png" res/raw/
|
||||
\cp "$1/emoji_ae_fe0f.png" res/raw/
|
||||
\cp "$1/emoji_2122.png" res/raw/
|
||||
\cp "$1/emoji_ae.png" res/raw/
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 8.6 KiB |
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.5 KiB |
|
|
@ -1,224 +0,0 @@
|
|||
diff -crB com.discord-1006-base/AndroidManifest.xml com.discord-1006/AndroidManifest.xml
|
||||
*** com.discord-1006-base/AndroidManifest.xml 2019-12-13 11:13:00.644825664 +0300
|
||||
--- com.discord-1006/AndroidManifest.xml 2019-12-13 12:51:55.270389347 +0300
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1006" platformBuildVersionName="10.0.6">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="1006CTCBUILD" platformBuildVersionName="10.0.6-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 19,31 ****
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 19,31 ----
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 88,94 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 88,94 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 118,124 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 118,124 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 148,154 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 148,154 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="top.distok.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 158,164 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 158,164 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 198,206 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 198,206 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
diff -crB com.discord-1006-base/apktool.yml com.discord-1006/apktool.yml
|
||||
*** com.discord-1006-base/apktool.yml 2019-12-13 11:10:59.767472683 +0300
|
||||
--- com.discord-1006/apktool.yml 2019-12-13 12:51:42.946967805 +0300
|
||||
***************
|
||||
*** 184,188 ****
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1006'
|
||||
! versionName: 10.0.6
|
||||
--- 184,188 ----
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1006CTCBUILD'
|
||||
! versionName: 10.0.6-cutthecord-CTCBUILD
|
||||
diff -crB com.discord-1006-base/res/values/strings.xml com.discord-1006/res/values/strings.xml
|
||||
*** com.discord-1006-base/res/values/strings.xml 2019-12-13 11:10:55.310779623 +0300
|
||||
--- com.discord-1006/res/values/strings.xml 2019-12-13 12:51:42.953634519 +0300
|
||||
***************
|
||||
*** 1325,1331 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1325,1331 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3263,3269 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3263,3269 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4483,4489 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
--- 4483,4489 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
diff -crB com.discord-1006-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-1006/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** com.discord-1006-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-13 11:10:57.307458114 +0300
|
||||
--- com.discord-1006/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-13 12:51:42.953634519 +0300
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 76,82 ----
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
||||
|
|
@ -1,241 +0,0 @@
|
|||
diff -crB com.discord-1007-base/AndroidManifest.xml com.discord-1007/AndroidManifest.xml
|
||||
*** com.discord-1007-base/AndroidManifest.xml 2019-12-15 13:40:47.516522153 +0300
|
||||
--- com.discord-1007/AndroidManifest.xml 2019-12-15 13:43:20.197380493 +0300
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1007" platformBuildVersionName="10.0.7">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="1007CTCBUILD" platformBuildVersionName="10.0.7-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 19,31 ****
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 19,31 ----
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 88,94 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 88,94 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 118,124 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 118,124 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 133,139 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
--- 133,139 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
***************
|
||||
*** 148,154 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 148,154 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 158,164 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 158,164 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 198,206 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 198,206 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
diff -crB com.discord-1007-base/apktool.yml com.discord-1007/apktool.yml
|
||||
*** com.discord-1007-base/apktool.yml 2019-12-15 13:40:27.489742899 +0300
|
||||
--- com.discord-1007/apktool.yml 2019-12-15 13:41:49.826872449 +0300
|
||||
***************
|
||||
*** 184,188 ****
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1007'
|
||||
! versionName: 10.0.7
|
||||
--- 184,188 ----
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1007CTCBUILD'
|
||||
! versionName: 10.0.7-cutthecord-CTCBUILD
|
||||
diff -crB com.discord-1007-base/res/values/strings.xml com.discord-1007/res/values/strings.xml
|
||||
*** com.discord-1007-base/res/values/strings.xml 2019-12-15 13:40:23.369719738 +0300
|
||||
--- com.discord-1007/res/values/strings.xml 2019-12-15 13:41:49.830205801 +0300
|
||||
***************
|
||||
*** 1325,1331 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1325,1331 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3257,3263 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3257,3263 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4477,4483 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
--- 4477,4483 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
diff -crB com.discord-1007-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-1007/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** com.discord-1007-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-15 13:40:24.949728621 +0300
|
||||
--- com.discord-1007/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-15 13:41:49.830205801 +0300
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 76,82 ----
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
||||
|
|
@ -1,240 +0,0 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2019-12-19 01:48:39.861161627 +0300
|
||||
--- to/AndroidManifest.xml 2019-12-19 01:48:42.061174985 +0300
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1011" platformBuildVersionName="10.1.1">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="1011CTCBUILD" platformBuildVersionName="10.1.1-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 19,31 ****
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 19,31 ----
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 88,94 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 88,94 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 118,124 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 118,124 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 133,139 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
--- 133,139 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
***************
|
||||
*** 148,154 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 148,154 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 158,164 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 158,164 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 198,206 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 198,206 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
diff -crB from/apktool.yml to/apktool.yml
|
||||
*** from/apktool.yml 2019-12-19 01:48:26.887749524 +0300
|
||||
--- to/apktool.yml 2019-12-19 01:48:42.061174985 +0300
|
||||
***************
|
||||
*** 184,188 ****
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1011'
|
||||
! versionName: 10.1.1
|
||||
--- 184,188 ----
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1011CTCBUILD'
|
||||
! versionName: 10.1.1-cutthecord-CTCBUILD
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2019-12-19 01:48:18.651032846 +0300
|
||||
--- to/res/values/strings.xml 2019-12-19 01:48:42.064508338 +0300
|
||||
***************
|
||||
*** 1320,1326 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1320,1326 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3259,3265 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3259,3265 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4486,4492 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
--- 4486,4492 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-19 01:48:22.364388726 +0300
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-19 01:48:42.064508338 +0300
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 76,82 ----
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
|
@ -1,240 +0,0 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2019-12-20 16:43:27.540506983 +0200
|
||||
--- to/AndroidManifest.xml 2019-12-20 16:43:30.127152569 +0200
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1012" platformBuildVersionName="10.1.2">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="1012CTCBUILD" platformBuildVersionName="10.1.2-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 19,31 ****
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 19,31 ----
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 88,94 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 88,94 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 118,124 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 118,124 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 133,139 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
--- 133,139 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
***************
|
||||
*** 148,154 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 148,154 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 158,164 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 158,164 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 198,206 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 198,206 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
diff -crB from/apktool.yml to/apktool.yml
|
||||
*** from/apktool.yml 2019-12-20 16:42:32.254312584 +0200
|
||||
--- to/apktool.yml 2019-12-20 16:43:30.127152569 +0200
|
||||
***************
|
||||
*** 184,188 ****
|
||||
tag: null
|
||||
version: 2.4.2-0143dc-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1012'
|
||||
! versionName: 10.1.2
|
||||
--- 184,188 ----
|
||||
tag: null
|
||||
version: 2.4.2-0143dc-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1012CTCBUILD'
|
||||
! versionName: 10.1.2-cutthecord-CTCBUILD
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2019-12-20 16:42:25.147709762 +0200
|
||||
--- to/res/values/strings.xml 2019-12-20 16:43:30.127152569 +0200
|
||||
***************
|
||||
*** 1319,1325 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1319,1325 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3252,3258 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3252,3258 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4473,4479 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
--- 4473,4479 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-20 16:42:28.281014855 +0200
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-20 16:43:30.127152569 +0200
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 76,82 ----
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
|
@ -1,243 +0,0 @@
|
|||
diff -crB com.discord-1013-base/AndroidManifest.xml com.discord-1013/AndroidManifest.xml
|
||||
*** com.discord-1013-base/AndroidManifest.xml 2019-12-21 21:31:39.126821471 +0300
|
||||
--- com.discord-1013/AndroidManifest.xml 2019-12-21 21:38:27.075863549 +0300
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1013" platformBuildVersionName="10.1.3">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="1013CTCBUILD" platformBuildVersionName="10.1.3-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 19,30 ****
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 19,30 ----
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 87,93 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 87,93 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 117,123 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 117,123 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 132,138 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
--- 132,138 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
***************
|
||||
*** 147,153 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 147,153 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 157,163 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 157,163 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 197,205 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 197,205 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
Only in com.discord-1013: AndroidManifest.xml.orig
|
||||
Only in com.discord-1013: AndroidManifest.xml.rej
|
||||
diff -crB com.discord-1013-base/apktool.yml com.discord-1013/apktool.yml
|
||||
*** com.discord-1013-base/apktool.yml 2019-12-21 21:31:19.773375445 +0300
|
||||
--- com.discord-1013/apktool.yml 2019-12-21 21:37:33.032215527 +0300
|
||||
***************
|
||||
*** 184,188 ****
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1013'
|
||||
! versionName: 10.1.3
|
||||
--- 184,188 ----
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1013CTCBUILD'
|
||||
! versionName: 10.1.3-cutthecord-CTCBUILD
|
||||
Only in com.discord-1013: apktool.yml.orig
|
||||
diff -crB com.discord-1013-base/res/values/strings.xml com.discord-1013/res/values/strings.xml
|
||||
*** com.discord-1013-base/res/values/strings.xml 2019-12-21 21:31:15.933353085 +0300
|
||||
--- com.discord-1013/res/values/strings.xml 2019-12-21 21:37:33.035548879 +0300
|
||||
***************
|
||||
*** 1347,1353 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1347,1353 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3296,3302 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3296,3302 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4523,4529 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
--- 4523,4529 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
Only in com.discord-1013/res/values: strings.xml.orig
|
||||
diff -crB com.discord-1013-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-1013/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** com.discord-1013-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-21 21:31:17.590029398 +0300
|
||||
--- com.discord-1013/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-21 21:37:33.035548879 +0300
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 76,82 ----
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
||||
|
|
@ -1,238 +0,0 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2019-12-29 13:09:26.716115553 +0200
|
||||
--- to/AndroidManifest.xml 2019-12-29 13:09:29.146120111 +0200
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1015" platformBuildVersionName="10.1.5">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="1015CTCBUILD" platformBuildVersionName="10.1.5-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 19,30 ****
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 19,30 ----
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 87,93 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 87,93 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 117,123 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 117,123 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 132,138 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
--- 132,138 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
***************
|
||||
*** 147,153 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 147,153 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 157,163 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 157,163 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 197,205 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 197,205 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
diff -crB from/apktool.yml to/apktool.yml
|
||||
*** from/apktool.yml 2019-12-29 13:09:13.709455599 +0200
|
||||
--- to/apktool.yml 2019-12-29 13:09:29.146120111 +0200
|
||||
***************
|
||||
*** 184,188 ****
|
||||
tag: null
|
||||
version: 2.4.2-0143dc-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1015'
|
||||
! versionName: 10.1.5
|
||||
--- 184,188 ----
|
||||
tag: null
|
||||
version: 2.4.2-0143dc-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1015CTCBUILD'
|
||||
! versionName: 10.1.5-cutthecord-CTCBUILD
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2019-12-29 13:09:08.146150435 +0200
|
||||
--- to/res/values/strings.xml 2019-12-29 13:09:29.146120111 +0200
|
||||
***************
|
||||
*** 1347,1353 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1347,1353 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3316,3322 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3316,3322 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4547,4553 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
--- 4547,4553 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-29 13:09:10.552802384 +0200
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-29 13:09:29.149453451 +0200
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 76,82 ----
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
|
@ -1,238 +0,0 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-01-03 17:09:20.264791973 +0200
|
||||
--- to/AndroidManifest.xml 2020-01-03 17:09:22.576488246 +0200
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1016" platformBuildVersionName="10.1.6">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="1016CTCBUILD" platformBuildVersionName="10.1.6-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 19,30 ****
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 19,30 ----
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 87,93 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 87,93 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 117,123 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 117,123 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 132,138 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
--- 132,138 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
***************
|
||||
*** 147,153 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 147,153 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 157,163 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 157,163 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 197,205 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 197,205 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
diff -crB from/apktool.yml to/apktool.yml
|
||||
*** from/apktool.yml 2020-01-03 17:09:09.228553656 +0200
|
||||
--- to/apktool.yml 2020-01-03 17:09:22.576488246 +0200
|
||||
***************
|
||||
*** 184,188 ****
|
||||
tag: null
|
||||
version: 2.4.2-0143dc-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1016'
|
||||
! versionName: 10.1.6
|
||||
--- 184,188 ----
|
||||
tag: null
|
||||
version: 2.4.2-0143dc-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1016CTCBUILD'
|
||||
! versionName: 10.1.6-cutthecord-CTCBUILD
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-01-03 17:08:57.124745448 +0200
|
||||
--- to/res/values/strings.xml 2020-01-03 17:09:22.576488246 +0200
|
||||
***************
|
||||
*** 1347,1353 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1347,1353 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3319,3325 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3319,3325 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4568,4574 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
--- 4568,4574 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-03 17:09:02.367309052 +0200
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-03 17:09:22.576488246 +0200
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 76,82 ----
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
|
@ -1,238 +0,0 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-01-10 14:33:58.469432489 +0300
|
||||
--- to/AndroidManifest.xml 2020-01-10 14:34:05.016131990 +0300
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1019" platformBuildVersionName="10.1.9">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="1019CTCBUILD" platformBuildVersionName="10.1.9-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 19,30 ****
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 19,30 ----
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 87,93 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 87,93 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 117,123 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 117,123 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 132,138 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
--- 132,138 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
***************
|
||||
*** 147,153 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 147,153 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 157,163 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 157,163 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 197,205 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 197,205 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
diff -crB from/apktool.yml to/apktool.yml
|
||||
*** from/apktool.yml 2020-01-10 14:08:32.545012974 +0300
|
||||
--- to/apktool.yml 2020-01-10 14:34:05.016131990 +0300
|
||||
***************
|
||||
*** 184,188 ****
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1019'
|
||||
! versionName: 10.1.9
|
||||
--- 184,188 ----
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1019CTCBUILD'
|
||||
! versionName: 10.1.9-cutthecord-CTCBUILD
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-01-10 14:08:27.964989874 +0300
|
||||
--- to/res/values/strings.xml 2020-01-10 14:34:05.016131990 +0300
|
||||
***************
|
||||
*** 1353,1359 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1353,1359 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3374,3380 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3374,3380 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4625,4631 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
--- 4625,4631 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-10 14:08:30.145000870 +0300
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-10 14:34:05.016131990 +0300
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 76,82 ----
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
|
@ -1,238 +0,0 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-01-11 15:50:08.021076672 +0000
|
||||
--- to/AndroidManifest.xml 2020-01-11 15:50:09.517740237 +0000
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1020" platformBuildVersionName="10.2.0">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="1020CTCBUILD" platformBuildVersionName="10.2.0-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 20,31 ****
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 20,31 ----
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 90,96 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 90,96 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 120,126 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 120,126 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 135,141 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
--- 135,141 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
***************
|
||||
*** 150,156 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 150,156 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 160,166 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 160,166 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 200,208 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 200,208 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
diff -crB from/apktool.yml to/apktool.yml
|
||||
*** from/apktool.yml 2020-01-11 15:47:46.884702594 +0000
|
||||
--- to/apktool.yml 2020-01-11 15:50:09.517740237 +0000
|
||||
***************
|
||||
*** 184,188 ****
|
||||
tag: null
|
||||
version: 2.4.2-0143dc-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1020'
|
||||
! versionName: 10.2.0
|
||||
--- 184,188 ----
|
||||
tag: null
|
||||
version: 2.4.2-0143dc-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1020CTCBUILD'
|
||||
! versionName: 10.2.0-cutthecord-CTCBUILD
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-01-11 15:47:41.754713225 +0000
|
||||
--- to/res/values/strings.xml 2020-01-11 15:50:09.517740237 +0000
|
||||
***************
|
||||
*** 1354,1360 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1354,1360 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3379,3385 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3379,3385 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4630,4636 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppress_muted">Muted by you</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
--- 4630,4636 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppress_muted">Muted by you</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-11 15:47:44.101375029 +0000
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-11 15:50:09.517740237 +0000
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 76,82 ----
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
|
@ -1,238 +0,0 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-01-11 15:50:08.021076672 +0000
|
||||
--- to/AndroidManifest.xml 2020-01-11 15:50:09.517740237 +0000
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1021" platformBuildVersionName="10.2.1">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="1021CTCBUILD" platformBuildVersionName="10.2.1-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 20,31 ****
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 20,31 ----
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 90,96 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 90,96 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 120,126 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 120,126 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 135,141 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
--- 135,141 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
***************
|
||||
*** 150,156 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 150,156 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 160,166 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 160,166 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 200,208 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 200,208 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
diff -crB from/apktool.yml to/apktool.yml
|
||||
*** from/apktool.yml 2020-01-11 15:47:46.884702594 +0000
|
||||
--- to/apktool.yml 2020-01-11 15:50:09.517740237 +0000
|
||||
***************
|
||||
*** 184,188 ****
|
||||
tag: null
|
||||
version: 2.4.2-0143dc-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1021'
|
||||
! versionName: 10.2.1
|
||||
--- 184,188 ----
|
||||
tag: null
|
||||
version: 2.4.2-0143dc-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1021CTCBUILD'
|
||||
! versionName: 10.2.1-cutthecord-CTCBUILD
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-01-11 15:47:41.754713225 +0000
|
||||
--- to/res/values/strings.xml 2020-01-11 15:50:09.517740237 +0000
|
||||
***************
|
||||
*** 1354,1360 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1354,1360 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3379,3385 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3379,3385 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4630,4636 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppress_muted">Muted by you</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
--- 4630,4636 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppress_muted">Muted by you</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-11 15:47:44.101375029 +0000
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-11 15:50:09.517740237 +0000
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 76,82 ----
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
|
@ -1,238 +0,0 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-01-16 10:47:29.620232342 +0300
|
||||
--- to/AndroidManifest.xml 2020-01-16 10:47:31.316908381 +0300
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1022" platformBuildVersionName="10.2.2">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="1022CTCBUILD" platformBuildVersionName="10.2.2-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 20,31 ****
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 20,31 ----
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 90,96 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 90,96 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 120,126 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 120,126 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 135,141 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
--- 135,141 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
***************
|
||||
*** 150,156 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 150,156 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 160,166 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 160,166 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 200,208 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 200,208 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
diff -crB from/apktool.yml to/apktool.yml
|
||||
*** from/apktool.yml 2020-01-16 10:47:13.890145453 +0300
|
||||
--- to/apktool.yml 2020-01-16 10:47:31.316908381 +0300
|
||||
***************
|
||||
*** 184,188 ****
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1022'
|
||||
! versionName: 10.2.2
|
||||
--- 184,188 ----
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1022CTCBUILD'
|
||||
! versionName: 10.2.2-cutthecord-CTCBUILD
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-01-16 10:47:09.946790338 +0300
|
||||
--- to/res/values/strings.xml 2020-01-16 10:47:31.316908381 +0300
|
||||
***************
|
||||
*** 1354,1360 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1354,1360 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3390,3396 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3390,3396 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4640,4646 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppress_muted">Muted by you</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
--- 4640,4646 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppress_muted">Muted by you</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-16 10:47:11.766800391 +0300
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-16 10:47:31.316908381 +0300
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 76,82 ----
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
|
@ -1,238 +0,0 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-01-16 10:47:29.620232342 +0300
|
||||
--- to/AndroidManifest.xml 2020-01-16 10:47:31.316908381 +0300
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1023" platformBuildVersionName="10.2.3">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="1023CTCBUILD" platformBuildVersionName="10.2.3-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 20,31 ****
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 20,31 ----
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 90,96 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 90,96 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 120,126 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 120,126 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 135,141 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
--- 135,141 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
***************
|
||||
*** 150,156 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 150,156 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 160,166 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 160,166 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 200,208 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 200,208 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
diff -crB from/apktool.yml to/apktool.yml
|
||||
*** from/apktool.yml 2020-01-16 10:47:13.890145453 +0300
|
||||
--- to/apktool.yml 2020-01-16 10:47:31.316908381 +0300
|
||||
***************
|
||||
*** 184,188 ****
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1023'
|
||||
! versionName: 10.2.3
|
||||
--- 184,188 ----
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1023CTCBUILD'
|
||||
! versionName: 10.2.3-cutthecord-CTCBUILD
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-01-16 10:47:09.946790338 +0300
|
||||
--- to/res/values/strings.xml 2020-01-16 10:47:31.316908381 +0300
|
||||
***************
|
||||
*** 1354,1360 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1354,1360 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3390,3396 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3390,3396 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4640,4646 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppress_muted">Muted by you</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
--- 4640,4646 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppress_muted">Muted by you</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-16 10:47:11.766800391 +0300
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-16 10:47:31.316908381 +0300
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 76,82 ----
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
|
@ -1,238 +0,0 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-01-18 14:21:47.436105598 +0000
|
||||
--- to/AndroidManifest.xml 2020-01-18 14:21:48.916070161 +0000
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1024" platformBuildVersionName="10.2.4">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="1024CTCBUILD" platformBuildVersionName="10.2.4-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 20,31 ****
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 20,31 ----
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 92,98 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 92,98 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 122,128 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 122,128 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 137,143 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
--- 137,143 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
***************
|
||||
*** 152,158 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 152,158 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 162,168 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 162,168 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 202,210 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 202,210 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
diff -crB from/apktool.yml to/apktool.yml
|
||||
*** from/apktool.yml 2020-01-18 14:21:34.713140148 +0000
|
||||
--- to/apktool.yml 2020-01-18 14:21:48.916070161 +0000
|
||||
***************
|
||||
*** 184,188 ****
|
||||
tag: null
|
||||
version: 2.4.2-0143dc-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1024'
|
||||
! versionName: 10.2.4
|
||||
--- 184,188 ----
|
||||
tag: null
|
||||
version: 2.4.2-0143dc-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1024CTCBUILD'
|
||||
! versionName: 10.2.4-cutthecord-CTCBUILD
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-01-18 14:21:29.369999066 +0000
|
||||
--- to/res/values/strings.xml 2020-01-18 14:21:48.916070161 +0000
|
||||
***************
|
||||
*** 1354,1360 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1354,1360 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3390,3396 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3390,3396 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4640,4646 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppress_muted">Muted by you</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
--- 4640,4646 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppress_muted">Muted by you</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-18 14:21:31.523252021 +0000
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-18 14:21:48.919403414 +0000
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 76,82 ----
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
|
@ -1,238 +0,0 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-01-22 15:07:32.859884935 +0000
|
||||
--- to/AndroidManifest.xml 2020-01-22 15:07:34.469944086 +0000
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1025" platformBuildVersionName="10.2.5">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="1025CTCBUILD" platformBuildVersionName="10.2.5-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 20,31 ****
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 20,31 ----
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 92,98 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 92,98 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 122,128 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 122,128 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 137,143 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
--- 137,143 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
***************
|
||||
*** 152,158 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 152,158 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 162,168 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 162,168 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 202,210 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 202,210 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
diff -crB from/apktool.yml to/apktool.yml
|
||||
*** from/apktool.yml 2020-01-22 15:07:25.909629598 +0000
|
||||
--- to/apktool.yml 2020-01-22 15:07:34.469944086 +0000
|
||||
***************
|
||||
*** 184,188 ****
|
||||
tag: null
|
||||
version: 2.4.2-0143dc-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1025'
|
||||
! versionName: 10.2.5
|
||||
--- 184,188 ----
|
||||
tag: null
|
||||
version: 2.4.2-0143dc-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1025CTCBUILD'
|
||||
! versionName: 10.2.5-cutthecord-CTCBUILD
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-01-22 15:07:20.422761361 +0000
|
||||
--- to/res/values/strings.xml 2020-01-22 15:07:34.469944086 +0000
|
||||
***************
|
||||
*** 1354,1360 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1354,1360 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3392,3398 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3392,3398 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4642,4648 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppress_muted">Muted by you</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
--- 4642,4648 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppress_muted">Muted by you</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-22 15:07:22.862851001 +0000
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-22 15:07:34.469944086 +0000
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 76,82 ----
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
|
@ -1,238 +0,0 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-01-23 00:10:35.583772364 +0000
|
||||
--- to/AndroidManifest.xml 2020-01-23 00:10:37.143768795 +0000
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1026" platformBuildVersionName="10.2.6">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="1026CTCBUILD" platformBuildVersionName="10.2.6-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 20,31 ****
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 20,31 ----
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 92,98 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 92,98 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 122,128 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 122,128 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 137,143 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
--- 137,143 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
***************
|
||||
*** 152,158 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 152,158 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 162,168 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 162,168 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 202,210 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 202,210 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
diff -crB from/apktool.yml to/apktool.yml
|
||||
*** from/apktool.yml 2020-01-23 00:10:24.933796725 +0000
|
||||
--- to/apktool.yml 2020-01-23 00:10:37.143768795 +0000
|
||||
***************
|
||||
*** 184,188 ****
|
||||
tag: null
|
||||
version: 2.4.2-0143dc-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1026'
|
||||
! versionName: 10.2.6
|
||||
--- 184,188 ----
|
||||
tag: null
|
||||
version: 2.4.2-0143dc-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1026CTCBUILD'
|
||||
! versionName: 10.2.6-cutthecord-CTCBUILD
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-01-23 00:10:21.503804571 +0000
|
||||
--- to/res/values/strings.xml 2020-01-23 00:10:37.143768795 +0000
|
||||
***************
|
||||
*** 1363,1369 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1363,1369 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3399,3405 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3399,3405 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4650,4656 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppress_muted">Muted by you</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
--- 4650,4656 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppress_muted">Muted by you</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-23 00:10:23.073800980 +0000
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-23 00:10:37.143768795 +0000
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 76,82 ----
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
|
@ -1,238 +0,0 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-01-28 12:44:58.650355155 +0000
|
||||
--- to/AndroidManifest.xml 2020-01-28 12:45:00.940365683 +0000
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1029" platformBuildVersionName="10.2.9">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="1029CTCBUILD" platformBuildVersionName="10.2.9-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 20,31 ****
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 20,31 ----
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 92,98 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 92,98 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 122,128 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 122,128 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 137,143 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
--- 137,143 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
***************
|
||||
*** 152,158 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 152,158 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 162,168 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 162,168 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 202,210 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 202,210 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
diff -crB from/apktool.yml to/apktool.yml
|
||||
*** from/apktool.yml 2020-01-28 12:44:34.333575756 +0000
|
||||
--- to/apktool.yml 2020-01-28 12:45:00.940365683 +0000
|
||||
***************
|
||||
*** 184,188 ****
|
||||
tag: null
|
||||
version: 2.4.2-0143dc-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1029'
|
||||
! versionName: 10.2.9
|
||||
--- 184,188 ----
|
||||
tag: null
|
||||
version: 2.4.2-0143dc-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1029CTCBUILD'
|
||||
! versionName: 10.2.9-cutthecord-CTCBUILD
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-01-28 12:44:28.786883130 +0000
|
||||
--- to/res/values/strings.xml 2020-01-28 12:45:00.943699031 +0000
|
||||
***************
|
||||
*** 1373,1379 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1373,1379 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3411,3417 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3411,3417 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4665,4671 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
--- 4665,4671 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-28 12:44:31.366895216 +0000
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-28 12:45:00.943699031 +0000
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 76,82 ----
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
|
@ -1,242 +0,0 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2019-11-27 13:17:41.862287805 +0300
|
||||
--- to/AndroidManifest.xml 2019-11-27 13:17:44.972284722 +0300
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="993" platformBuildVersionName="9.9.3">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="993CTCBUILD" platformBuildVersionName="9.9.3-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 19,30 ****
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 19,30 ----
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 85,91 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 85,91 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 115,121 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 115,121 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 141,147 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 141,147 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="top.distok.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 151,157 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 151,157 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 191,199 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
</manifest>
|
||||
\ No newline at end of file
|
||||
--- 191,199 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
</manifest>
|
||||
\ No newline at end of file
|
||||
diff -crB from/apktool.yml to/apktool.yml
|
||||
*** from/apktool.yml 2019-11-27 13:15:18.949285901 +0300
|
||||
--- to/apktool.yml 2019-11-27 13:17:44.972284722 +0300
|
||||
***************
|
||||
*** 179,183 ****
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '993'
|
||||
! versionName: 9.9.3
|
||||
--- 179,183 ----
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '993CTCBUILD'
|
||||
! versionName: 9.9.3-cutthecord-CTCBUILD
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2019-11-27 13:15:10.329376584 +0300
|
||||
--- to/res/values/strings.xml 2019-11-27 13:17:44.972284722 +0300
|
||||
***************
|
||||
*** 1296,1302 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1296,1302 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3193,3199 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3193,3199 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4401,4407 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
--- 4401,4407 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
diff -crB from/smali/com/discord/app/e.smali to/smali/com/discord/app/e.smali
|
||||
*** from/smali/com/discord/app/e.smali 2019-11-27 13:15:13.996004677 +0300
|
||||
--- to/smali/com/discord/app/e.smali 2019-11-27 13:17:44.972284722 +0300
|
||||
***************
|
||||
*** 56,62 ****
|
||||
.line 16
|
||||
sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String;
|
||||
|
||||
! const-string v0, "https://support.discordapp.com"
|
||||
|
||||
.line 18
|
||||
sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String;
|
||||
--- 56,62 ----
|
||||
.line 16
|
||||
sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String;
|
||||
|
||||
! const-string v0, "https://gitdab.com/distok/cutthecord"
|
||||
|
||||
.line 18
|
||||
sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String;
|
||||
diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-11-27 13:15:14.649331138 +0300
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-11-27 13:17:44.975618052 +0300
|
||||
***************
|
||||
*** 78,84 ****
|
||||
.line 65
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 67
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 78,84 ----
|
||||
.line 65
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 67
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
|
@ -1,242 +0,0 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2019-11-28 09:20:30.323506767 +0300
|
||||
--- to/AndroidManifest.xml 2019-11-28 09:20:34.033527192 +0300
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="994" platformBuildVersionName="9.9.4">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="994CTCBUILD" platformBuildVersionName="9.9.4-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 19,30 ****
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 19,30 ----
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 85,91 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 85,91 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 115,121 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 115,121 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 141,147 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 141,147 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="top.distok.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 151,157 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 151,157 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 191,199 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
</manifest>
|
||||
\ No newline at end of file
|
||||
--- 191,199 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
</manifest>
|
||||
\ No newline at end of file
|
||||
diff -crB from/apktool.yml to/apktool.yml
|
||||
*** from/apktool.yml 2019-11-28 09:20:26.040149852 +0300
|
||||
--- to/apktool.yml 2019-11-28 09:20:34.033527192 +0300
|
||||
***************
|
||||
*** 180,184 ****
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '994'
|
||||
! versionName: 9.9.4
|
||||
--- 180,184 ----
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '994CTCBUILD'
|
||||
! versionName: 9.9.4-cutthecord-CTCBUILD
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2019-11-28 09:20:21.816793266 +0300
|
||||
--- to/res/values/strings.xml 2019-11-28 09:20:34.036860544 +0300
|
||||
***************
|
||||
*** 1296,1302 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1296,1302 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3197,3203 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3197,3203 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4405,4411 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
--- 4405,4411 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
diff -crB from/smali/com/discord/app/e.smali to/smali/com/discord/app/e.smali
|
||||
*** from/smali/com/discord/app/e.smali 2019-11-28 09:20:23.663470100 +0300
|
||||
--- to/smali/com/discord/app/e.smali 2019-11-28 09:20:34.036860544 +0300
|
||||
***************
|
||||
*** 56,62 ****
|
||||
.line 16
|
||||
sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String;
|
||||
|
||||
! const-string v0, "https://support.discordapp.com"
|
||||
|
||||
.line 18
|
||||
sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String;
|
||||
--- 56,62 ----
|
||||
.line 16
|
||||
sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String;
|
||||
|
||||
! const-string v0, "https://gitdab.com/distok/cutthecord"
|
||||
|
||||
.line 18
|
||||
sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String;
|
||||
diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-11-28 09:20:23.980138510 +0300
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-11-28 09:20:34.036860544 +0300
|
||||
***************
|
||||
*** 78,84 ****
|
||||
.line 65
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 67
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 78,84 ----
|
||||
.line 65
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 67
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
|
@ -1,259 +0,0 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2019-12-05 11:24:15.137500289 +0300
|
||||
--- to/AndroidManifest.xml 2019-12-05 11:24:16.764173966 +0300
|
||||
***************
|
||||
*** 1,4 ****
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="996" platformBuildVersionName="9.9.6">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
--- 1,4 ----
|
||||
! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="996CTCBUILD" platformBuildVersionName="9.9.6-cutthecord-CTCBUILD">
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.faketouch" android:required="false"/>
|
||||
***************
|
||||
*** 19,30 ****
|
||||
<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="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
--- 19,30 ----
|
||||
<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.cutthecord.CTCBRANCH.permission.CONNECT" android:protectionLevel="dangerous"/>
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
|
||||
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
! <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
|
||||
<activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
|
||||
<activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
|
||||
<activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
|
||||
***************
|
||||
*** 85,91 ****
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.discord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
--- 85,91 ----
|
||||
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <service android:exported="true" android:name="com.discord.app.DiscordConnectService" android:permission="com.cutthecord.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 115,121 ****
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
--- 115,121 ----
|
||||
</receiver>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
|
||||
<service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
|
||||
</provider>
|
||||
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
|
||||
***************
|
||||
*** 130,136 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
--- 130,136 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
|
||||
</service>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
***************
|
||||
*** 145,151 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
--- 145,151 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
! <provider android:authorities="top.distok.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
|
||||
<intent-filter>
|
||||
***************
|
||||
*** 155,161 ****
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
--- 155,161 ----
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
|
||||
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
<receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
|
||||
***************
|
||||
*** 195,203 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
</manifest>
|
||||
\ No newline at end of file
|
||||
--- 195,203 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
|
||||
! <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
</manifest>
|
||||
\ No newline at end of file
|
||||
diff -crB from/apktool.yml to/apktool.yml
|
||||
*** from/apktool.yml 2019-12-05 11:22:33.230394481 +0300
|
||||
--- to/apktool.yml 2019-12-05 11:24:16.764173966 +0300
|
||||
***************
|
||||
*** 185,189 ****
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '996'
|
||||
! versionName: 9.9.6
|
||||
--- 185,189 ----
|
||||
tag: null
|
||||
version: 2.4.1-197d46-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '996CTCBUILD'
|
||||
! versionName: 9.9.6-cutthecord-CTCBUILD
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2019-12-05 11:22:28.590374487 +0300
|
||||
--- to/res/values/strings.xml 2019-12-05 11:24:16.764173966 +0300
|
||||
***************
|
||||
*** 1296,1302 ****
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1296,1302 ----
|
||||
<string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
|
||||
<string name="discord_desc_short">Team voice & text chat</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 3198,3204 ****
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">Discord</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
--- 3198,3204 ----
|
||||
<string name="notification_reply_failed">Failed to reply to %1$s</string>
|
||||
<string name="notification_reply_success">Replied to %1$s</string>
|
||||
<string name="notification_settings">Notification Settings</string>
|
||||
! <string name="notification_title_discord">CTCNAME</string>
|
||||
<string name="notification_title_start_game">"Somebody Playin'"</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="notifications_nuf_body">Setup notifications to know when your friends send a message.</string>
|
||||
***************
|
||||
*** 4406,4412 ****
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">Support</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
--- 4406,4412 ----
|
||||
<string name="subscriptions_title">Subscriptions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="summary_collapsed_preference_list">%1$s, %2$s</string>
|
||||
! <string name="support">CutTheCord Repo</string>
|
||||
<string name="suppress_all_embeds">Remove all embeds</string>
|
||||
<string name="suppressed">Suppressed</string>
|
||||
<string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
|
||||
diff -crB from/smali/com/discord/app/e.smali to/smali/com/discord/app/e.smali
|
||||
*** from/smali/com/discord/app/e.smali 2019-12-05 11:22:30.347048723 +0300
|
||||
--- to/smali/com/discord/app/e.smali 2019-12-05 11:24:16.764173966 +0300
|
||||
***************
|
||||
*** 56,62 ****
|
||||
.line 16
|
||||
sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String;
|
||||
|
||||
! const-string v0, "https://support.discordapp.com"
|
||||
|
||||
.line 18
|
||||
sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String;
|
||||
--- 56,62 ----
|
||||
.line 16
|
||||
sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String;
|
||||
|
||||
! const-string v0, "https://gitdab.com/distok/cutthecord"
|
||||
|
||||
.line 18
|
||||
sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String;
|
||||
diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
|
||||
*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-05 11:22:30.653716711 +0300
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-05 11:24:16.764173966 +0300
|
||||
***************
|
||||
*** 78,84 ****
|
||||
.line 65
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discordapp.com/app"
|
||||
|
||||
.line 67
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 78,84 ----
|
||||
.line 65
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
|
||||
|
||||
.line 67
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
|
|
@ -72,23 +72,4 @@ You can use the following line to patch authorities:
|
|||
- 9.8.6
|
||||
- 9.9.1
|
||||
- 9.9.2
|
||||
- 9.9.3
|
||||
- 9.9.4
|
||||
- 9.9.6
|
||||
- 10.0.6
|
||||
- 10.0.7
|
||||
- 10.1.1
|
||||
- 10.1.2
|
||||
- 10.1.3
|
||||
- 10.1.5
|
||||
- 10.1.6
|
||||
- 10.1.9
|
||||
- 10.2.0
|
||||
- 10.2.1
|
||||
- 10.2.2
|
||||
- 10.2.3
|
||||
- 10.2.4
|
||||
- 10.2.5
|
||||
- 10.2.6
|
||||
- 10.2.9
|
||||
|
||||
|
|
|
|||
|
|
@ -38,12 +38,4 @@ This patch changes default list of custom emojis.
|
|||
- 9.8.6
|
||||
- 9.9.1
|
||||
- 9.9.2
|
||||
- 9.9.3
|
||||
- 9.9.4
|
||||
- 9.9.6
|
||||
- 10.0.6
|
||||
- 10.0.7
|
||||
- 10.1.1
|
||||
- 10.1.2
|
||||
- 10.1.3
|
||||
|
||||
|
|
@ -1,280 +0,0 @@
|
|||
diff -crB com.discord-1006-base/res/drawable/drawable_overlay_channels_active.xml com.discord-1006/res/drawable/drawable_overlay_channels_active.xml
|
||||
*** com.discord-1006-base/res/drawable/drawable_overlay_channels_active.xml 2019-12-13 11:10:54.057438867 +0300
|
||||
--- com.discord-1006/res/drawable/drawable_overlay_channels_active.xml 2019-12-13 12:24:14.692722949 +0300
|
||||
***************
|
||||
*** 3,9 ****
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_500_alpha_60" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
--- 3,9 ----
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_700_alpha_60" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
diff -crB com.discord-1006-base/res/values/colors.xml com.discord-1006/res/values/colors.xml
|
||||
*** com.discord-1006-base/res/values/colors.xml 2019-12-13 11:10:55.210779031 +0300
|
||||
--- com.discord-1006/res/values/colors.xml 2019-12-13 12:24:14.692722949 +0300
|
||||
***************
|
||||
*** 52,58 ****
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
--- 52,58 ----
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff000000</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
***************
|
||||
*** 63,70 ****
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff36393e</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_default_color_primary">#ff3f51b5</color>
|
||||
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||
--- 63,70 ----
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff000000</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_default_color_primary">#ff3f51b5</color>
|
||||
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||
***************
|
||||
*** 98,106 ****
|
||||
<color name="grey_6">#ff4f545c</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||
! <color name="grey_account">#ff282b30</color>
|
||||
! <color name="grey_channels">#ff2e3136</color>
|
||||
! <color name="grey_guilds">#ff1e2124</color>
|
||||
<color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
--- 98,106 ----
|
||||
<color name="grey_6">#ff4f545c</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||
! <color name="grey_account">#ff000000</color>
|
||||
! <color name="grey_channels">#ff000000</color>
|
||||
! <color name="grey_guilds">#ff000000</color>
|
||||
<color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
***************
|
||||
*** 108,114 ****
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff00b0f4</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
--- 108,114 ----
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff50f148</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
***************
|
||||
*** 152,169 ****
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff4f545c</color>
|
||||
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff36393f</color>
|
||||
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||
! <color name="primary_630">#ff2f3136</color>
|
||||
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff202225</color>
|
||||
! <color name="primary_700_alpha_60">#99202225</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
--- 152,169 ----
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff0f0f0f</color>
|
||||
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||
! <color name="primary_500_alpha_60">#99404040</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff000000</color>
|
||||
! <color name="primary_600_alpha_60">#99000000</color>
|
||||
! <color name="primary_630">#ff000000</color>
|
||||
! <color name="primary_630_alpha_60">#99000000</color>
|
||||
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff0f0f0f</color>
|
||||
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
***************
|
||||
*** 194,202 ****
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff738bd7</color>
|
||||
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
--- 194,202 ----
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff9c4249</color>
|
||||
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||
! <color name="purple_brand_dark">#ff000000</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
***************
|
||||
*** 259,265 ****
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6616161</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
--- 259,265 ----
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6000000</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
Only in com.discord-1006/res/values: colors.xml.orig
|
||||
diff -crB com.discord-1006-base/res/values/styles.xml com.discord-1006/res/values/styles.xml
|
||||
*** com.discord-1006-base/res/values/styles.xml 2019-12-13 11:10:55.260779327 +0300
|
||||
--- com.discord-1006/res/values/styles.xml 2019-12-13 12:24:14.692722949 +0300
|
||||
***************
|
||||
*** 381,387 ****
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/grey_channels</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
--- 381,387 ----
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/grey_channels</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
***************
|
||||
*** 393,404 ****
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
--- 393,404 ----
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
***************
|
||||
*** 461,467 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
--- 461,467 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
***************
|
||||
*** 491,497 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
|
||||
--- 491,497 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
|
||||
Only in com.discord-1006/res/values: styles.xml.orig
|
||||
diff -crB com.discord-1006-base/smali/com/discord/app/AppActivity$d.smali com.discord-1006/smali/com/discord/app/AppActivity$d.smali
|
||||
*** com.discord-1006-base/smali/com/discord/app/AppActivity$d.smali 2019-12-13 11:10:56.940789276 +0300
|
||||
--- com.discord-1006/smali/com/discord/app/AppActivity$d.smali 2019-12-13 12:24:25.019454915 +0300
|
||||
***************
|
||||
*** 115,121 ****
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060139
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
--- 115,121 ----
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060021
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
Only in com.discord-1006/smali/com/discord/app: AppActivity$d.smali.orig
|
||||
Only in com.discord-1006/smali/com/discord/app: AppActivity$d.smali.rej
|
||||
|
||||
|
|
@ -1,280 +0,0 @@
|
|||
diff -crB com.discord-1006-base/res/drawable/drawable_overlay_channels_active.xml com.discord-1006/res/drawable/drawable_overlay_channels_active.xml
|
||||
*** com.discord-1006-base/res/drawable/drawable_overlay_channels_active.xml 2019-12-13 11:10:54.057438867 +0300
|
||||
--- com.discord-1006/res/drawable/drawable_overlay_channels_active.xml 2019-12-13 12:24:14.692722949 +0300
|
||||
***************
|
||||
*** 3,9 ****
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_500_alpha_60" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
--- 3,9 ----
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_700_alpha_60" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
diff -crB com.discord-1006-base/res/values/colors.xml com.discord-1006/res/values/colors.xml
|
||||
*** com.discord-1006-base/res/values/colors.xml 2019-12-13 11:10:55.210779031 +0300
|
||||
--- com.discord-1006/res/values/colors.xml 2019-12-13 12:24:14.692722949 +0300
|
||||
***************
|
||||
*** 52,58 ****
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
--- 52,58 ----
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff000000</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
***************
|
||||
*** 63,70 ****
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff36393e</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_default_color_primary">#ff3f51b5</color>
|
||||
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||
--- 63,70 ----
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff000000</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_default_color_primary">#ff3f51b5</color>
|
||||
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||
***************
|
||||
*** 98,106 ****
|
||||
<color name="grey_6">#ff4f545c</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||
! <color name="grey_account">#ff282b30</color>
|
||||
! <color name="grey_channels">#ff2e3136</color>
|
||||
! <color name="grey_guilds">#ff1e2124</color>
|
||||
<color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
--- 98,106 ----
|
||||
<color name="grey_6">#ff4f545c</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||
! <color name="grey_account">#ff000000</color>
|
||||
! <color name="grey_channels">#ff000000</color>
|
||||
! <color name="grey_guilds">#ff000000</color>
|
||||
<color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
***************
|
||||
*** 108,114 ****
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff00b0f4</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
--- 108,114 ----
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff50f148</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
***************
|
||||
*** 152,169 ****
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff4f545c</color>
|
||||
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff36393f</color>
|
||||
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||
! <color name="primary_630">#ff2f3136</color>
|
||||
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff202225</color>
|
||||
! <color name="primary_700_alpha_60">#99202225</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
--- 152,169 ----
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff0f0f0f</color>
|
||||
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||
! <color name="primary_500_alpha_60">#99404040</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff000000</color>
|
||||
! <color name="primary_600_alpha_60">#99000000</color>
|
||||
! <color name="primary_630">#ff000000</color>
|
||||
! <color name="primary_630_alpha_60">#99000000</color>
|
||||
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff0f0f0f</color>
|
||||
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
***************
|
||||
*** 194,202 ****
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff738bd7</color>
|
||||
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
--- 194,202 ----
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff9c4249</color>
|
||||
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||
! <color name="purple_brand_dark">#ff000000</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
***************
|
||||
*** 259,265 ****
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6616161</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
--- 259,265 ----
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6000000</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
Only in com.discord-1006/res/values: colors.xml.orig
|
||||
diff -crB com.discord-1006-base/res/values/styles.xml com.discord-1006/res/values/styles.xml
|
||||
*** com.discord-1006-base/res/values/styles.xml 2019-12-13 11:10:55.260779327 +0300
|
||||
--- com.discord-1006/res/values/styles.xml 2019-12-13 12:24:14.692722949 +0300
|
||||
***************
|
||||
*** 381,387 ****
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/grey_channels</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
--- 381,387 ----
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/grey_channels</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
***************
|
||||
*** 393,404 ****
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
--- 393,404 ----
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
***************
|
||||
*** 461,467 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
--- 461,467 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
***************
|
||||
*** 491,497 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
|
||||
--- 491,497 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
|
||||
Only in com.discord-1006/res/values: styles.xml.orig
|
||||
diff -crB com.discord-1006-base/smali/com/discord/app/AppActivity$d.smali com.discord-1006/smali/com/discord/app/AppActivity$d.smali
|
||||
*** com.discord-1006-base/smali/com/discord/app/AppActivity$d.smali 2019-12-13 11:10:56.940789276 +0300
|
||||
--- com.discord-1006/smali/com/discord/app/AppActivity$d.smali 2019-12-13 12:24:25.019454915 +0300
|
||||
***************
|
||||
*** 115,121 ****
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060139
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
--- 115,121 ----
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060021
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
Only in com.discord-1006/smali/com/discord/app: AppActivity$d.smali.orig
|
||||
Only in com.discord-1006/smali/com/discord/app: AppActivity$d.smali.rej
|
||||
|
||||
|
|
@ -1,275 +0,0 @@
|
|||
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-19 01:48:17.627693300 +0300
|
||||
--- to/res/drawable/drawable_overlay_channels_active.xml 2019-12-19 01:48:47.827876665 +0300
|
||||
***************
|
||||
*** 3,9 ****
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_500_alpha_60" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
--- 3,9 ----
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_700_alpha_60" />
|
||||
<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-19 01:48:19.074368750 +0300
|
||||
--- to/res/values/colors.xml 2019-12-19 01:48:47.827876665 +0300
|
||||
***************
|
||||
*** 52,58 ****
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
--- 52,58 ----
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff000000</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
***************
|
||||
*** 63,70 ****
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff36393e</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_default_color_primary">#ff3f51b5</color>
|
||||
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||
--- 63,70 ----
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff000000</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_default_color_primary">#ff3f51b5</color>
|
||||
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||
***************
|
||||
*** 98,106 ****
|
||||
<color name="grey_6">#ff4f545c</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||
! <color name="grey_account">#ff282b30</color>
|
||||
! <color name="grey_channels">#ff2e3136</color>
|
||||
! <color name="grey_guilds">#ff1e2124</color>
|
||||
<color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
--- 98,106 ----
|
||||
<color name="grey_6">#ff4f545c</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||
! <color name="grey_account">#ff000000</color>
|
||||
! <color name="grey_channels">#ff000000</color>
|
||||
! <color name="grey_guilds">#ff000000</color>
|
||||
<color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
***************
|
||||
*** 108,114 ****
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff00b0f4</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
--- 108,114 ----
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff50f148</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
***************
|
||||
*** 152,169 ****
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff4f545c</color>
|
||||
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff36393f</color>
|
||||
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||
! <color name="primary_630">#ff2f3136</color>
|
||||
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff202225</color>
|
||||
! <color name="primary_700_alpha_60">#99202225</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
--- 152,169 ----
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff0f0f0f</color>
|
||||
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||
! <color name="primary_500_alpha_60">#99404040</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff000000</color>
|
||||
! <color name="primary_600_alpha_60">#99000000</color>
|
||||
! <color name="primary_630">#ff000000</color>
|
||||
! <color name="primary_630_alpha_60">#99000000</color>
|
||||
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff0f0f0f</color>
|
||||
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
***************
|
||||
*** 194,202 ****
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff738bd7</color>
|
||||
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
--- 194,202 ----
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff9c4249</color>
|
||||
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||
! <color name="purple_brand_dark">#ff000000</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
***************
|
||||
*** 259,265 ****
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6616161</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
--- 259,265 ----
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6000000</color>
|
||||
<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-19 01:48:19.167702650 +0300
|
||||
--- to/res/values/styles.xml 2019-12-19 01:48:47.827876665 +0300
|
||||
***************
|
||||
*** 379,385 ****
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/grey_channels</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
--- 379,385 ----
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/grey_channels</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
***************
|
||||
*** 391,402 ****
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
--- 391,402 ----
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
***************
|
||||
*** 459,465 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
--- 459,465 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
***************
|
||||
*** 489,495 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
|
||||
--- 489,495 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</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-19 01:48:21.714384780 +0300
|
||||
--- to/smali/com/discord/app/AppActivity$d.smali 2019-12-19 01:48:47.827876665 +0300
|
||||
***************
|
||||
*** 115,121 ****
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060139
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
--- 115,121 ----
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060021
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
|
|
@ -1,277 +0,0 @@
|
|||
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-20 17:01:27.112582207 +0200
|
||||
--- to/res/drawable/drawable_overlay_channels_active.xml 2019-12-20 17:18:57.576103360 +0200
|
||||
***************
|
||||
*** 3,9 ****
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_500_alpha_60" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
--- 3,9 ----
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_700_alpha_60" />
|
||||
<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-20 17:01:28.522579003 +0200
|
||||
--- to/res/values/colors.xml 2019-12-20 17:18:57.576103360 +0200
|
||||
***************
|
||||
*** 51,57 ****
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
--- 51,57 ----
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff000000</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
***************
|
||||
*** 62,69 ****
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff36393e</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_default_color_primary">#ff3f51b5</color>
|
||||
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||
--- 62,69 ----
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff000000</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_default_color_primary">#ff3f51b5</color>
|
||||
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||
***************
|
||||
*** 97,105 ****
|
||||
<color name="grey_6">#ff4f545c</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||
! <color name="grey_account">#ff282b30</color>
|
||||
! <color name="grey_channels">#ff2e3136</color>
|
||||
! <color name="grey_guilds">#ff1e2124</color>
|
||||
<color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
--- 97,105 ----
|
||||
<color name="grey_6">#ff4f545c</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||
! <color name="grey_account">#ff000000</color>
|
||||
! <color name="grey_channels">#ff000000</color>
|
||||
! <color name="grey_guilds">#ff000000</color>
|
||||
<color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
***************
|
||||
*** 107,113 ****
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff00b0f4</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
--- 107,113 ----
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff50f148</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
***************
|
||||
*** 151,168 ****
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff4f545c</color>
|
||||
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff36393f</color>
|
||||
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||
! <color name="primary_630">#ff2f3136</color>
|
||||
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff202225</color>
|
||||
! <color name="primary_700_alpha_60">#99202225</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
--- 151,168 ----
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff0f0f0f</color>
|
||||
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||
! <color name="primary_500_alpha_60">#99404040</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff000000</color>
|
||||
! <color name="primary_600_alpha_60">#99000000</color>
|
||||
! <color name="primary_630">#ff000000</color>
|
||||
! <color name="primary_630_alpha_60">#99000000</color>
|
||||
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff0f0f0f</color>
|
||||
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
***************
|
||||
*** 193,201 ****
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff738bd7</color>
|
||||
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
--- 193,201 ----
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff9c4249</color>
|
||||
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||
! <color name="purple_brand_dark">#ff000000</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
***************
|
||||
*** 258,264 ****
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6616161</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
--- 258,264 ----
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6000000</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
Only in to/res/values: colors.xml.orig
|
||||
diff -crB from/res/values/styles.xml to/res/values/styles.xml
|
||||
*** from/res/values/styles.xml 2019-12-20 17:01:28.605912147 +0200
|
||||
--- to/res/values/styles.xml 2019-12-20 17:18:57.579436668 +0200
|
||||
***************
|
||||
*** 377,383 ****
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/grey_channels</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
--- 377,383 ----
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/grey_channels</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
***************
|
||||
*** 389,400 ****
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
--- 389,400 ----
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
***************
|
||||
*** 457,463 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
--- 457,463 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
***************
|
||||
*** 487,493 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
|
||||
--- 487,493 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
|
||||
Only in to/res/values: styles.xml.orig
|
||||
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-20 17:01:30.662574147 +0200
|
||||
--- to/smali/com/discord/app/AppActivity$d.smali 2019-12-20 17:20:08.148931702 +0200
|
||||
***************
|
||||
*** 115,121 ****
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060138
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
--- 115,121 ----
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060021
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
|
|
@ -1,280 +0,0 @@
|
|||
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">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_500_alpha_60" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
--- 3,9 ----
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_700_alpha_60" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
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>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
--- 52,58 ----
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff000000</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
***************
|
||||
*** 63,70 ****
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff36393e</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_default_color_primary">#ff3f51b5</color>
|
||||
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||
--- 63,70 ----
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff000000</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_default_color_primary">#ff3f51b5</color>
|
||||
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||
***************
|
||||
*** 98,106 ****
|
||||
<color name="grey_6">#ff4f545c</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||
! <color name="grey_account">#ff282b30</color>
|
||||
! <color name="grey_channels">#ff2e3136</color>
|
||||
! <color name="grey_guilds">#ff1e2124</color>
|
||||
<color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
--- 98,106 ----
|
||||
<color name="grey_6">#ff4f545c</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||
! <color name="grey_account">#ff000000</color>
|
||||
! <color name="grey_channels">#ff000000</color>
|
||||
! <color name="grey_guilds">#ff000000</color>
|
||||
<color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
***************
|
||||
*** 108,114 ****
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff00b0f4</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
--- 108,114 ----
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff50f148</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
***************
|
||||
*** 153,170 ****
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff4f545c</color>
|
||||
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff36393f</color>
|
||||
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||
! <color name="primary_630">#ff2f3136</color>
|
||||
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff202225</color>
|
||||
! <color name="primary_700_alpha_60">#99202225</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
--- 153,170 ----
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff0f0f0f</color>
|
||||
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||
! <color name="primary_500_alpha_60">#99404040</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff000000</color>
|
||||
! <color name="primary_600_alpha_60">#99000000</color>
|
||||
! <color name="primary_630">#ff000000</color>
|
||||
! <color name="primary_630_alpha_60">#99000000</color>
|
||||
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff0f0f0f</color>
|
||||
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
***************
|
||||
*** 195,203 ****
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff738bd7</color>
|
||||
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
--- 195,203 ----
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff9c4249</color>
|
||||
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||
! <color name="purple_brand_dark">#ff000000</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
***************
|
||||
*** 260,266 ****
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6616161</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
--- 260,266 ----
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6000000</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
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>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/grey_channels</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
--- 380,386 ----
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/grey_channels</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
***************
|
||||
*** 392,403 ****
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
--- 392,403 ----
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
***************
|
||||
*** 460,466 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
--- 460,466 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
***************
|
||||
*** 490,496 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
|
||||
--- 490,496 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
|
||||
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
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f06013a
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
--- 115,121 ----
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060021
|
||||
|
||||
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
|
||||
|
||||
|
|
@ -1,280 +0,0 @@
|
|||
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">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_500_alpha_60" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
--- 3,9 ----
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_700_alpha_60" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
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>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
--- 52,58 ----
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff000000</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
***************
|
||||
*** 63,70 ****
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff36393e</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_default_color_primary">#ff3f51b5</color>
|
||||
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||
--- 63,70 ----
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff000000</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_default_color_primary">#ff3f51b5</color>
|
||||
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||
***************
|
||||
*** 98,106 ****
|
||||
<color name="grey_6">#ff4f545c</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||
! <color name="grey_account">#ff282b30</color>
|
||||
! <color name="grey_channels">#ff2e3136</color>
|
||||
! <color name="grey_guilds">#ff1e2124</color>
|
||||
<color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
--- 98,106 ----
|
||||
<color name="grey_6">#ff4f545c</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||
! <color name="grey_account">#ff000000</color>
|
||||
! <color name="grey_channels">#ff000000</color>
|
||||
! <color name="grey_guilds">#ff000000</color>
|
||||
<color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
***************
|
||||
*** 108,114 ****
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff00b0f4</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
--- 108,114 ----
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff50f148</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
***************
|
||||
*** 153,170 ****
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff4f545c</color>
|
||||
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff36393f</color>
|
||||
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||
! <color name="primary_630">#ff2f3136</color>
|
||||
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff202225</color>
|
||||
! <color name="primary_700_alpha_60">#99202225</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
--- 153,170 ----
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff0f0f0f</color>
|
||||
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||
! <color name="primary_500_alpha_60">#99404040</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff000000</color>
|
||||
! <color name="primary_600_alpha_60">#99000000</color>
|
||||
! <color name="primary_630">#ff000000</color>
|
||||
! <color name="primary_630_alpha_60">#99000000</color>
|
||||
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff0f0f0f</color>
|
||||
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
***************
|
||||
*** 195,203 ****
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff738bd7</color>
|
||||
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
--- 195,203 ----
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff9c4249</color>
|
||||
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||
! <color name="purple_brand_dark">#ff000000</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
***************
|
||||
*** 260,266 ****
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6616161</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
--- 260,266 ----
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6000000</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
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>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/grey_channels</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
--- 380,386 ----
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/grey_channels</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
***************
|
||||
*** 392,403 ****
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
--- 392,403 ----
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
***************
|
||||
*** 460,466 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
--- 460,466 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
***************
|
||||
*** 490,496 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
|
||||
--- 490,496 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
|
||||
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
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f06013a
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
--- 115,121 ----
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060021
|
||||
|
||||
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
|
||||
|
||||
|
|
@ -1,275 +0,0 @@
|
|||
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 2020-01-03 17:10:07.762251542 +0200
|
||||
--- to/res/drawable/drawable_overlay_channels_active.xml 2020-01-03 17:10:40.629938093 +0200
|
||||
***************
|
||||
*** 3,9 ****
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_500_alpha_60" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
--- 3,9 ----
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_700_alpha_60" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
diff -crB from/res/values/colors.xml to/res/values/colors.xml
|
||||
*** from/res/values/colors.xml 2020-01-03 17:10:08.958833152 +0200
|
||||
--- to/res/values/colors.xml 2020-01-03 17:10:40.633272083 +0200
|
||||
***************
|
||||
*** 52,58 ****
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
--- 52,58 ----
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff000000</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
***************
|
||||
*** 63,70 ****
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff36393e</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_default_color_primary">#ff3f51b5</color>
|
||||
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||
--- 63,70 ----
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff000000</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_default_color_primary">#ff3f51b5</color>
|
||||
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||
***************
|
||||
*** 98,106 ****
|
||||
<color name="grey_6">#ff4f545c</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||
! <color name="grey_account">#ff282b30</color>
|
||||
! <color name="grey_channels">#ff2e3136</color>
|
||||
! <color name="grey_guilds">#ff1e2124</color>
|
||||
<color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
--- 98,106 ----
|
||||
<color name="grey_6">#ff4f545c</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||
! <color name="grey_account">#ff000000</color>
|
||||
! <color name="grey_channels">#ff000000</color>
|
||||
! <color name="grey_guilds">#ff000000</color>
|
||||
<color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
***************
|
||||
*** 108,114 ****
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff00b0f4</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
--- 108,114 ----
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff50f148</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
***************
|
||||
*** 154,171 ****
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff4f545c</color>
|
||||
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff36393f</color>
|
||||
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||
! <color name="primary_630">#ff2f3136</color>
|
||||
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff202225</color>
|
||||
! <color name="primary_700_alpha_60">#99202225</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
--- 154,171 ----
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff0f0f0f</color>
|
||||
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||
! <color name="primary_500_alpha_60">#99404040</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff000000</color>
|
||||
! <color name="primary_600_alpha_60">#99000000</color>
|
||||
! <color name="primary_630">#ff000000</color>
|
||||
! <color name="primary_630_alpha_60">#99000000</color>
|
||||
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff0f0f0f</color>
|
||||
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
***************
|
||||
*** 196,204 ****
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff738bd7</color>
|
||||
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
--- 196,204 ----
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff9c4249</color>
|
||||
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||
! <color name="purple_brand_dark">#ff000000</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
***************
|
||||
*** 262,268 ****
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6616161</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
--- 262,268 ----
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6000000</color>
|
||||
<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 2020-01-03 17:10:08.935504504 +0200
|
||||
--- to/res/values/styles.xml 2020-01-03 17:10:40.633272083 +0200
|
||||
***************
|
||||
*** 384,390 ****
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/grey_channels</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
--- 384,390 ----
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/grey_channels</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
***************
|
||||
*** 396,407 ****
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
--- 396,407 ----
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
***************
|
||||
*** 464,470 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
--- 464,470 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
***************
|
||||
*** 494,500 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
|
||||
--- 494,500 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</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 2020-01-03 17:10:10.578549379 +0200
|
||||
--- to/smali/com/discord/app/AppActivity$d.smali 2020-01-03 17:11:35.260497105 +0200
|
||||
***************
|
||||
*** 115,121 ****
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f06013c
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
--- 115,121 ----
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060021
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
|
|
@ -1,279 +0,0 @@
|
|||
Only in com.discord-1019: build
|
||||
Only in com.discord-1019: dist
|
||||
diff -crB com.discord-1019-base/res/drawable/drawable_overlay_channels_active_dark.xml com.discord-1019/res/drawable/drawable_overlay_channels_active_dark.xml
|
||||
*** com.discord-1019-base/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-10 14:08:27.148319088 +0300
|
||||
--- com.discord-1019/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-10 16:27:06.038997431 +0300
|
||||
***************
|
||||
*** 3,9 ****
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="#ff42464d" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
--- 3,9 ----
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_500" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
diff -crB com.discord-1019-base/res/values/colors.xml com.discord-1019/res/values/colors.xml
|
||||
*** com.discord-1019-base/res/values/colors.xml 2020-01-10 14:08:28.108323930 +0300
|
||||
--- com.discord-1019/res/values/colors.xml 2020-01-10 16:24:47.604776595 +0300
|
||||
***************
|
||||
*** 52,58 ****
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
--- 52,58 ----
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff000000</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
***************
|
||||
*** 63,70 ****
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff36393e</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_dark_default_color_background">#ff121212</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
--- 63,70 ----
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff000000</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_dark_default_color_background">#ff121212</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
***************
|
||||
*** 120,134 ****
|
||||
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||
<color name="grey_4">#ff949494</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
! <color name="grey_account">#ff282b30</color>
|
||||
! <color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
<color name="hypesquad_house1">#ff9c84ef</color>
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff00b0f4</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
--- 120,134 ----
|
||||
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||
<color name="grey_4">#ff949494</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
! <color name="grey_account">#ff000000</color>
|
||||
! <color name="grey_unread">#ff000000</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
<color name="hypesquad_house1">#ff9c84ef</color>
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff50f148</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
***************
|
||||
*** 176,195 ****
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff4f545c</color>
|
||||
! <color name="primary_500_alpha_20">#334f545c</color>
|
||||
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||
! <color name="primary_500_alpha_32">#514f545c</color>
|
||||
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff36393f</color>
|
||||
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||
! <color name="primary_630">#ff2f3136</color>
|
||||
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff202225</color>
|
||||
! <color name="primary_700_alpha_60">#99202225</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
--- 176,195 ----
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff0f0f0f</color>
|
||||
! <color name="primary_500_alpha_20">#330f0f0f</color>
|
||||
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||
! <color name="primary_500_alpha_32">#510f0f0f</color>
|
||||
! <color name="primary_500_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff000000</color>
|
||||
! <color name="primary_600_alpha_60">#99000000</color>
|
||||
! <color name="primary_630">#ff000000</color>
|
||||
! <color name="primary_630_alpha_60">#99000000</color>
|
||||
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff000000</color>
|
||||
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
***************
|
||||
*** 224,232 ****
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff738bd7</color>
|
||||
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
--- 224,232 ----
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff9c4249</color>
|
||||
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||
! <color name="purple_brand_dark">#ff000000</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
***************
|
||||
*** 291,297 ****
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6616161</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
--- 291,297 ----
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6000000</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
diff -crB com.discord-1019-base/res/values/styles.xml com.discord-1019/res/values/styles.xml
|
||||
*** com.discord-1019-base/res/values/styles.xml 2020-01-10 14:08:28.151657482 +0300
|
||||
--- com.discord-1019/res/values/styles.xml 2020-01-10 16:05:59.883687355 +0300
|
||||
***************
|
||||
*** 389,395 ****
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/primary_630</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
--- 389,395 ----
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/primary_630</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
***************
|
||||
*** 401,412 ****
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
--- 401,412 ----
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
***************
|
||||
*** 468,474 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
--- 468,474 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
***************
|
||||
*** 498,504 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||
--- 498,504 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||
diff -crB com.discord-1019-base/smali/com/discord/app/AppActivity$d.smali com.discord-1019/smali/com/discord/app/AppActivity$d.smali
|
||||
*** com.discord-1019-base/smali/com/discord/app/AppActivity$d.smali 2020-01-10 14:08:29.688331899 +0300
|
||||
--- com.discord-1019/smali/com/discord/app/AppActivity$d.smali 2020-01-10 16:06:12.260451666 +0300
|
||||
***************
|
||||
*** 115,121 ****
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f06017e
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
--- 115,121 ----
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060021
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
Only in com.discord-1019/smali/com/discord/app: AppActivity$d.smali.orig
|
||||
Only in com.discord-1019/smali/com/discord/app: AppActivity$d.smali.rej
|
||||
|
||||
|
|
@ -1,281 +0,0 @@
|
|||
diff -crB com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml
|
||||
*** com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-12 11:58:54.830668343 +0300
|
||||
--- com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-12 12:30:53.961941373 +0300
|
||||
***************
|
||||
*** 3,9 ****
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="#ff42464d" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
--- 3,9 ----
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_500" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
diff -crB com.discord-1020-base/res/values/colors.xml com.discord-1020/res/values/colors.xml
|
||||
*** com.discord-1020-base/res/values/colors.xml 2020-01-12 11:58:55.320671069 +0300
|
||||
--- com.discord-1020/res/values/colors.xml 2020-01-12 12:47:04.817926576 +0300
|
||||
***************
|
||||
*** 52,58 ****
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
--- 52,58 ----
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff000000</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
***************
|
||||
*** 63,70 ****
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff36393e</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_dark_default_color_background">#ff121212</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
--- 63,70 ----
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff000000</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_dark_default_color_background">#ff121212</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
***************
|
||||
*** 120,134 ****
|
||||
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||
<color name="grey_4">#ff949494</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
! <color name="grey_account">#ff282b30</color>
|
||||
! <color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
<color name="hypesquad_house1">#ff9c84ef</color>
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff00b0f4</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
--- 120,134 ----
|
||||
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||
<color name="grey_4">#ff949494</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
! <color name="grey_account">#ff000000</color>
|
||||
! <color name="grey_unread">#ff000000</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
<color name="hypesquad_house1">#ff9c84ef</color>
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff50f148</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
***************
|
||||
*** 176,195 ****
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff4f545c</color>
|
||||
! <color name="primary_500_alpha_20">#334f545c</color>
|
||||
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||
! <color name="primary_500_alpha_32">#514f545c</color>
|
||||
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff36393f</color>
|
||||
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||
! <color name="primary_630">#ff2f3136</color>
|
||||
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff202225</color>
|
||||
! <color name="primary_700_alpha_60">#99202225</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
--- 176,195 ----
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff333333</color>
|
||||
! <color name="primary_500_alpha_20">#330f0f0f</color>
|
||||
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||
! <color name="primary_500_alpha_32">#510f0f0f</color>
|
||||
! <color name="primary_500_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff000000</color>
|
||||
! <color name="primary_600_alpha_60">#99000000</color>
|
||||
! <color name="primary_630">#ff000000</color>
|
||||
! <color name="primary_630_alpha_60">#99000000</color>
|
||||
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff000000</color>
|
||||
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
***************
|
||||
*** 224,232 ****
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff738bd7</color>
|
||||
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
--- 224,232 ----
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff9c4249</color>
|
||||
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||
! <color name="purple_brand_dark">#ff000000</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
***************
|
||||
*** 291,297 ****
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6616161</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
--- 291,297 ----
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6000000</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
diff -crB com.discord-1020-base/res/values/styles.xml com.discord-1020/res/values/styles.xml
|
||||
*** com.discord-1020-base/res/values/styles.xml 2020-01-12 11:58:55.240670624 +0300
|
||||
--- com.discord-1020/res/values/styles.xml 2020-01-12 12:46:14.510949392 +0300
|
||||
***************
|
||||
*** 392,398 ****
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/primary_630</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
--- 392,398 ----
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/primary_630</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
***************
|
||||
*** 404,418 ****
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
! <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_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||||
--- 404,418 ----
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
! <item name="theme_chat_spoiler_bg">@color/primary_500</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_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||||
***************
|
||||
*** 471,477 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
--- 471,477 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
***************
|
||||
*** 501,507 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||
--- 501,507 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||
diff -crB com.discord-1020-base/smali/com/discord/app/AppActivity$d.smali com.discord-1020/smali/com/discord/app/AppActivity$d.smali
|
||||
*** com.discord-1020-base/smali/com/discord/app/AppActivity$d.smali 2020-01-12 11:58:56.794012599 +0300
|
||||
--- com.discord-1020/smali/com/discord/app/AppActivity$d.smali 2020-01-12 12:30:53.965274726 +0300
|
||||
***************
|
||||
*** 115,121 ****
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f06017e
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
--- 115,121 ----
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060021
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
|
||||
|
|
@ -1,281 +0,0 @@
|
|||
diff -crB com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml
|
||||
*** com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-12 11:58:54.830668343 +0300
|
||||
--- com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-12 12:30:53.961941373 +0300
|
||||
***************
|
||||
*** 3,9 ****
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="#ff42464d" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
--- 3,9 ----
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_500" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
diff -crB com.discord-1020-base/res/values/colors.xml com.discord-1020/res/values/colors.xml
|
||||
*** com.discord-1020-base/res/values/colors.xml 2020-01-12 11:58:55.320671069 +0300
|
||||
--- com.discord-1020/res/values/colors.xml 2020-01-12 12:47:04.817926576 +0300
|
||||
***************
|
||||
*** 52,58 ****
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
--- 52,58 ----
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff000000</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
***************
|
||||
*** 63,70 ****
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff36393e</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_dark_default_color_background">#ff121212</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
--- 63,70 ----
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff000000</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_dark_default_color_background">#ff121212</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
***************
|
||||
*** 120,134 ****
|
||||
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||
<color name="grey_4">#ff949494</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
! <color name="grey_account">#ff282b30</color>
|
||||
! <color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
<color name="hypesquad_house1">#ff9c84ef</color>
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff00b0f4</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
--- 120,134 ----
|
||||
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||
<color name="grey_4">#ff949494</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
! <color name="grey_account">#ff000000</color>
|
||||
! <color name="grey_unread">#ff000000</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
<color name="hypesquad_house1">#ff9c84ef</color>
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff50f148</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
***************
|
||||
*** 176,195 ****
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff4f545c</color>
|
||||
! <color name="primary_500_alpha_20">#334f545c</color>
|
||||
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||
! <color name="primary_500_alpha_32">#514f545c</color>
|
||||
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff36393f</color>
|
||||
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||
! <color name="primary_630">#ff2f3136</color>
|
||||
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff202225</color>
|
||||
! <color name="primary_700_alpha_60">#99202225</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
--- 176,195 ----
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff333333</color>
|
||||
! <color name="primary_500_alpha_20">#330f0f0f</color>
|
||||
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||
! <color name="primary_500_alpha_32">#510f0f0f</color>
|
||||
! <color name="primary_500_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff000000</color>
|
||||
! <color name="primary_600_alpha_60">#99000000</color>
|
||||
! <color name="primary_630">#ff000000</color>
|
||||
! <color name="primary_630_alpha_60">#99000000</color>
|
||||
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff000000</color>
|
||||
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
***************
|
||||
*** 224,232 ****
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff738bd7</color>
|
||||
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
--- 224,232 ----
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff9c4249</color>
|
||||
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||
! <color name="purple_brand_dark">#ff000000</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
***************
|
||||
*** 291,297 ****
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6616161</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
--- 291,297 ----
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6000000</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
diff -crB com.discord-1020-base/res/values/styles.xml com.discord-1020/res/values/styles.xml
|
||||
*** com.discord-1020-base/res/values/styles.xml 2020-01-12 11:58:55.240670624 +0300
|
||||
--- com.discord-1020/res/values/styles.xml 2020-01-12 12:46:14.510949392 +0300
|
||||
***************
|
||||
*** 392,398 ****
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/primary_630</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
--- 392,398 ----
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/primary_630</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
***************
|
||||
*** 404,418 ****
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
! <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_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||||
--- 404,418 ----
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
! <item name="theme_chat_spoiler_bg">@color/primary_500</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_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||||
***************
|
||||
*** 471,477 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
--- 471,477 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
***************
|
||||
*** 501,507 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||
--- 501,507 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||
diff -crB com.discord-1020-base/smali/com/discord/app/AppActivity$d.smali com.discord-1020/smali/com/discord/app/AppActivity$d.smali
|
||||
*** com.discord-1020-base/smali/com/discord/app/AppActivity$d.smali 2020-01-12 11:58:56.794012599 +0300
|
||||
--- com.discord-1020/smali/com/discord/app/AppActivity$d.smali 2020-01-12 12:30:53.965274726 +0300
|
||||
***************
|
||||
*** 115,121 ****
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f06017e
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
--- 115,121 ----
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060021
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
|
||||
|
|
@ -1,281 +0,0 @@
|
|||
diff -crB com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml
|
||||
*** com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-12 11:58:54.830668343 +0300
|
||||
--- com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-12 12:30:53.961941373 +0300
|
||||
***************
|
||||
*** 3,9 ****
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="#ff42464d" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
--- 3,9 ----
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_500" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
diff -crB com.discord-1020-base/res/values/colors.xml com.discord-1020/res/values/colors.xml
|
||||
*** com.discord-1020-base/res/values/colors.xml 2020-01-12 11:58:55.320671069 +0300
|
||||
--- com.discord-1020/res/values/colors.xml 2020-01-12 12:47:04.817926576 +0300
|
||||
***************
|
||||
*** 52,58 ****
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
--- 52,58 ----
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff000000</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
***************
|
||||
*** 63,70 ****
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff36393e</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_dark_default_color_background">#ff121212</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
--- 63,70 ----
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff000000</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_dark_default_color_background">#ff121212</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
***************
|
||||
*** 120,134 ****
|
||||
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||
<color name="grey_4">#ff949494</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
! <color name="grey_account">#ff282b30</color>
|
||||
! <color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
<color name="hypesquad_house1">#ff9c84ef</color>
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff00b0f4</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
--- 120,134 ----
|
||||
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||
<color name="grey_4">#ff949494</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
! <color name="grey_account">#ff000000</color>
|
||||
! <color name="grey_unread">#ff000000</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
<color name="hypesquad_house1">#ff9c84ef</color>
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff50f148</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
***************
|
||||
*** 176,195 ****
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff4f545c</color>
|
||||
! <color name="primary_500_alpha_20">#334f545c</color>
|
||||
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||
! <color name="primary_500_alpha_32">#514f545c</color>
|
||||
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff36393f</color>
|
||||
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||
! <color name="primary_630">#ff2f3136</color>
|
||||
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff202225</color>
|
||||
! <color name="primary_700_alpha_60">#99202225</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
--- 176,195 ----
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff333333</color>
|
||||
! <color name="primary_500_alpha_20">#330f0f0f</color>
|
||||
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||
! <color name="primary_500_alpha_32">#510f0f0f</color>
|
||||
! <color name="primary_500_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff000000</color>
|
||||
! <color name="primary_600_alpha_60">#99000000</color>
|
||||
! <color name="primary_630">#ff000000</color>
|
||||
! <color name="primary_630_alpha_60">#99000000</color>
|
||||
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff000000</color>
|
||||
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
***************
|
||||
*** 224,232 ****
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff738bd7</color>
|
||||
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
--- 224,232 ----
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff9c4249</color>
|
||||
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||
! <color name="purple_brand_dark">#ff000000</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
***************
|
||||
*** 291,297 ****
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6616161</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
--- 291,297 ----
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6000000</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
diff -crB com.discord-1020-base/res/values/styles.xml com.discord-1020/res/values/styles.xml
|
||||
*** com.discord-1020-base/res/values/styles.xml 2020-01-12 11:58:55.240670624 +0300
|
||||
--- com.discord-1020/res/values/styles.xml 2020-01-12 12:46:14.510949392 +0300
|
||||
***************
|
||||
*** 392,398 ****
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/primary_630</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
--- 392,398 ----
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/primary_630</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
***************
|
||||
*** 404,418 ****
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
! <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_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||||
--- 404,418 ----
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
! <item name="theme_chat_spoiler_bg">@color/primary_500</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_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||||
***************
|
||||
*** 471,477 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
--- 471,477 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
***************
|
||||
*** 501,507 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||
--- 501,507 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||
diff -crB com.discord-1020-base/smali/com/discord/app/AppActivity$d.smali com.discord-1020/smali/com/discord/app/AppActivity$d.smali
|
||||
*** com.discord-1020-base/smali/com/discord/app/AppActivity$d.smali 2020-01-12 11:58:56.794012599 +0300
|
||||
--- com.discord-1020/smali/com/discord/app/AppActivity$d.smali 2020-01-12 12:30:53.965274726 +0300
|
||||
***************
|
||||
*** 115,121 ****
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f06017e
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
--- 115,121 ----
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060021
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
|
||||
|
|
@ -1,281 +0,0 @@
|
|||
diff -crB com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml
|
||||
*** com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-12 11:58:54.830668343 +0300
|
||||
--- com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-12 12:30:53.961941373 +0300
|
||||
***************
|
||||
*** 3,9 ****
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="#ff42464d" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
--- 3,9 ----
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_500" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
diff -crB com.discord-1020-base/res/values/colors.xml com.discord-1020/res/values/colors.xml
|
||||
*** com.discord-1020-base/res/values/colors.xml 2020-01-12 11:58:55.320671069 +0300
|
||||
--- com.discord-1020/res/values/colors.xml 2020-01-12 12:47:04.817926576 +0300
|
||||
***************
|
||||
*** 52,58 ****
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
--- 52,58 ----
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff000000</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
***************
|
||||
*** 63,70 ****
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff36393e</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_dark_default_color_background">#ff121212</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
--- 63,70 ----
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff000000</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_dark_default_color_background">#ff121212</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
***************
|
||||
*** 120,134 ****
|
||||
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||
<color name="grey_4">#ff949494</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
! <color name="grey_account">#ff282b30</color>
|
||||
! <color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
<color name="hypesquad_house1">#ff9c84ef</color>
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff00b0f4</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
--- 120,134 ----
|
||||
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||
<color name="grey_4">#ff949494</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
! <color name="grey_account">#ff000000</color>
|
||||
! <color name="grey_unread">#ff000000</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
<color name="hypesquad_house1">#ff9c84ef</color>
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff50f148</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
***************
|
||||
*** 176,195 ****
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff4f545c</color>
|
||||
! <color name="primary_500_alpha_20">#334f545c</color>
|
||||
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||
! <color name="primary_500_alpha_32">#514f545c</color>
|
||||
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff36393f</color>
|
||||
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||
! <color name="primary_630">#ff2f3136</color>
|
||||
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff202225</color>
|
||||
! <color name="primary_700_alpha_60">#99202225</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
--- 176,195 ----
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff333333</color>
|
||||
! <color name="primary_500_alpha_20">#330f0f0f</color>
|
||||
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||
! <color name="primary_500_alpha_32">#510f0f0f</color>
|
||||
! <color name="primary_500_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff000000</color>
|
||||
! <color name="primary_600_alpha_60">#99000000</color>
|
||||
! <color name="primary_630">#ff000000</color>
|
||||
! <color name="primary_630_alpha_60">#99000000</color>
|
||||
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff000000</color>
|
||||
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
***************
|
||||
*** 224,232 ****
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff738bd7</color>
|
||||
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
--- 224,232 ----
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff9c4249</color>
|
||||
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||
! <color name="purple_brand_dark">#ff000000</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
***************
|
||||
*** 291,297 ****
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6616161</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
--- 291,297 ----
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6000000</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
diff -crB com.discord-1020-base/res/values/styles.xml com.discord-1020/res/values/styles.xml
|
||||
*** com.discord-1020-base/res/values/styles.xml 2020-01-12 11:58:55.240670624 +0300
|
||||
--- com.discord-1020/res/values/styles.xml 2020-01-12 12:46:14.510949392 +0300
|
||||
***************
|
||||
*** 392,398 ****
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/primary_630</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
--- 392,398 ----
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/primary_630</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
***************
|
||||
*** 404,418 ****
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
! <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_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||||
--- 404,418 ----
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
! <item name="theme_chat_spoiler_bg">@color/primary_500</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_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||||
***************
|
||||
*** 471,477 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
--- 471,477 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
***************
|
||||
*** 501,507 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||
--- 501,507 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||
diff -crB com.discord-1020-base/smali/com/discord/app/AppActivity$d.smali com.discord-1020/smali/com/discord/app/AppActivity$d.smali
|
||||
*** com.discord-1020-base/smali/com/discord/app/AppActivity$d.smali 2020-01-12 11:58:56.794012599 +0300
|
||||
--- com.discord-1020/smali/com/discord/app/AppActivity$d.smali 2020-01-12 12:30:53.965274726 +0300
|
||||
***************
|
||||
*** 115,121 ****
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f06017e
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
--- 115,121 ----
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060021
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
|
||||
|
|
@ -1,281 +0,0 @@
|
|||
diff -crB com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml
|
||||
*** com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-12 11:58:54.830668343 +0300
|
||||
--- com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-12 12:30:53.961941373 +0300
|
||||
***************
|
||||
*** 3,9 ****
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="#ff42464d" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
--- 3,9 ----
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_500" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
diff -crB com.discord-1020-base/res/values/colors.xml com.discord-1020/res/values/colors.xml
|
||||
*** com.discord-1020-base/res/values/colors.xml 2020-01-12 11:58:55.320671069 +0300
|
||||
--- com.discord-1020/res/values/colors.xml 2020-01-12 12:47:04.817926576 +0300
|
||||
***************
|
||||
*** 52,58 ****
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
--- 52,58 ----
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff000000</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
***************
|
||||
*** 63,70 ****
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff36393e</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_dark_default_color_background">#ff121212</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
--- 63,70 ----
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff000000</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_dark_default_color_background">#ff121212</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
***************
|
||||
*** 120,134 ****
|
||||
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||
<color name="grey_4">#ff949494</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
! <color name="grey_account">#ff282b30</color>
|
||||
! <color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
<color name="hypesquad_house1">#ff9c84ef</color>
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff00b0f4</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
--- 120,134 ----
|
||||
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||
<color name="grey_4">#ff949494</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
! <color name="grey_account">#ff000000</color>
|
||||
! <color name="grey_unread">#ff000000</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
<color name="hypesquad_house1">#ff9c84ef</color>
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff50f148</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
***************
|
||||
*** 176,195 ****
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff4f545c</color>
|
||||
! <color name="primary_500_alpha_20">#334f545c</color>
|
||||
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||
! <color name="primary_500_alpha_32">#514f545c</color>
|
||||
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff36393f</color>
|
||||
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||
! <color name="primary_630">#ff2f3136</color>
|
||||
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff202225</color>
|
||||
! <color name="primary_700_alpha_60">#99202225</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
--- 176,195 ----
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff333333</color>
|
||||
! <color name="primary_500_alpha_20">#330f0f0f</color>
|
||||
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||
! <color name="primary_500_alpha_32">#510f0f0f</color>
|
||||
! <color name="primary_500_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff000000</color>
|
||||
! <color name="primary_600_alpha_60">#99000000</color>
|
||||
! <color name="primary_630">#ff000000</color>
|
||||
! <color name="primary_630_alpha_60">#99000000</color>
|
||||
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff000000</color>
|
||||
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
***************
|
||||
*** 224,232 ****
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff738bd7</color>
|
||||
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
--- 224,232 ----
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff9c4249</color>
|
||||
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||
! <color name="purple_brand_dark">#ff000000</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
***************
|
||||
*** 291,297 ****
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6616161</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
--- 291,297 ----
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6000000</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
diff -crB com.discord-1020-base/res/values/styles.xml com.discord-1020/res/values/styles.xml
|
||||
*** com.discord-1020-base/res/values/styles.xml 2020-01-12 11:58:55.240670624 +0300
|
||||
--- com.discord-1020/res/values/styles.xml 2020-01-12 12:46:14.510949392 +0300
|
||||
***************
|
||||
*** 392,398 ****
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/primary_630</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
--- 392,398 ----
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/primary_630</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
***************
|
||||
*** 404,418 ****
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
! <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_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||||
--- 404,418 ----
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
! <item name="theme_chat_spoiler_bg">@color/primary_500</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_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||||
***************
|
||||
*** 471,477 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
--- 471,477 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
***************
|
||||
*** 501,507 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||
--- 501,507 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||
diff -crB com.discord-1020-base/smali/com/discord/app/AppActivity$d.smali com.discord-1020/smali/com/discord/app/AppActivity$d.smali
|
||||
*** com.discord-1020-base/smali/com/discord/app/AppActivity$d.smali 2020-01-12 11:58:56.794012599 +0300
|
||||
--- com.discord-1020/smali/com/discord/app/AppActivity$d.smali 2020-01-12 12:30:53.965274726 +0300
|
||||
***************
|
||||
*** 115,121 ****
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f06017e
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
--- 115,121 ----
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060021
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
|
||||
|
|
@ -1,281 +0,0 @@
|
|||
diff -crB com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml
|
||||
*** com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-12 11:58:54.830668343 +0300
|
||||
--- com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-12 12:30:53.961941373 +0300
|
||||
***************
|
||||
*** 3,9 ****
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="#ff42464d" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
--- 3,9 ----
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_500" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
diff -crB com.discord-1020-base/res/values/colors.xml com.discord-1020/res/values/colors.xml
|
||||
*** com.discord-1020-base/res/values/colors.xml 2020-01-12 11:58:55.320671069 +0300
|
||||
--- com.discord-1020/res/values/colors.xml 2020-01-12 12:47:04.817926576 +0300
|
||||
***************
|
||||
*** 52,58 ****
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
--- 52,58 ----
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff000000</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
***************
|
||||
*** 63,70 ****
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff36393e</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_dark_default_color_background">#ff121212</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
--- 63,70 ----
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff000000</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_dark_default_color_background">#ff121212</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
***************
|
||||
*** 120,134 ****
|
||||
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||
<color name="grey_4">#ff949494</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
! <color name="grey_account">#ff282b30</color>
|
||||
! <color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
<color name="hypesquad_house1">#ff9c84ef</color>
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff00b0f4</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
--- 120,134 ----
|
||||
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||
<color name="grey_4">#ff949494</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
! <color name="grey_account">#ff000000</color>
|
||||
! <color name="grey_unread">#ff000000</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
<color name="hypesquad_house1">#ff9c84ef</color>
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff50f148</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
***************
|
||||
*** 176,195 ****
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff4f545c</color>
|
||||
! <color name="primary_500_alpha_20">#334f545c</color>
|
||||
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||
! <color name="primary_500_alpha_32">#514f545c</color>
|
||||
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff36393f</color>
|
||||
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||
! <color name="primary_630">#ff2f3136</color>
|
||||
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff202225</color>
|
||||
! <color name="primary_700_alpha_60">#99202225</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
--- 176,195 ----
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff333333</color>
|
||||
! <color name="primary_500_alpha_20">#330f0f0f</color>
|
||||
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||
! <color name="primary_500_alpha_32">#510f0f0f</color>
|
||||
! <color name="primary_500_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff000000</color>
|
||||
! <color name="primary_600_alpha_60">#99000000</color>
|
||||
! <color name="primary_630">#ff000000</color>
|
||||
! <color name="primary_630_alpha_60">#99000000</color>
|
||||
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff000000</color>
|
||||
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
***************
|
||||
*** 224,232 ****
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff738bd7</color>
|
||||
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
--- 224,232 ----
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff9c4249</color>
|
||||
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||
! <color name="purple_brand_dark">#ff000000</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
***************
|
||||
*** 291,297 ****
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6616161</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
--- 291,297 ----
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6000000</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
diff -crB com.discord-1020-base/res/values/styles.xml com.discord-1020/res/values/styles.xml
|
||||
*** com.discord-1020-base/res/values/styles.xml 2020-01-12 11:58:55.240670624 +0300
|
||||
--- com.discord-1020/res/values/styles.xml 2020-01-12 12:46:14.510949392 +0300
|
||||
***************
|
||||
*** 392,398 ****
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/primary_630</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
--- 392,398 ----
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/primary_630</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
***************
|
||||
*** 404,418 ****
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
! <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_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||||
--- 404,418 ----
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
! <item name="theme_chat_spoiler_bg">@color/primary_500</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_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||||
***************
|
||||
*** 471,477 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
--- 471,477 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
***************
|
||||
*** 501,507 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||
--- 501,507 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||
diff -crB com.discord-1020-base/smali/com/discord/app/AppActivity$d.smali com.discord-1020/smali/com/discord/app/AppActivity$d.smali
|
||||
*** com.discord-1020-base/smali/com/discord/app/AppActivity$d.smali 2020-01-12 11:58:56.794012599 +0300
|
||||
--- com.discord-1020/smali/com/discord/app/AppActivity$d.smali 2020-01-12 12:30:53.965274726 +0300
|
||||
***************
|
||||
*** 115,121 ****
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f06017e
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
--- 115,121 ----
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060021
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
|
||||
|
|
@ -1,281 +0,0 @@
|
|||
diff -crB com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml
|
||||
*** com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-12 11:58:54.830668343 +0300
|
||||
--- com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-12 12:30:53.961941373 +0300
|
||||
***************
|
||||
*** 3,9 ****
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="#ff42464d" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
--- 3,9 ----
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_500" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
diff -crB com.discord-1020-base/res/values/colors.xml com.discord-1020/res/values/colors.xml
|
||||
*** com.discord-1020-base/res/values/colors.xml 2020-01-12 11:58:55.320671069 +0300
|
||||
--- com.discord-1020/res/values/colors.xml 2020-01-12 12:47:04.817926576 +0300
|
||||
***************
|
||||
*** 52,58 ****
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
--- 52,58 ----
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff000000</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
***************
|
||||
*** 63,70 ****
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff36393e</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_dark_default_color_background">#ff121212</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
--- 63,70 ----
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff000000</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_dark_default_color_background">#ff121212</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
***************
|
||||
*** 120,134 ****
|
||||
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||
<color name="grey_4">#ff949494</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
! <color name="grey_account">#ff282b30</color>
|
||||
! <color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
<color name="hypesquad_house1">#ff9c84ef</color>
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff00b0f4</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
--- 120,134 ----
|
||||
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||
<color name="grey_4">#ff949494</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
! <color name="grey_account">#ff000000</color>
|
||||
! <color name="grey_unread">#ff000000</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
<color name="hypesquad_house1">#ff9c84ef</color>
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff50f148</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
***************
|
||||
*** 176,195 ****
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff4f545c</color>
|
||||
! <color name="primary_500_alpha_20">#334f545c</color>
|
||||
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||
! <color name="primary_500_alpha_32">#514f545c</color>
|
||||
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff36393f</color>
|
||||
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||
! <color name="primary_630">#ff2f3136</color>
|
||||
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff202225</color>
|
||||
! <color name="primary_700_alpha_60">#99202225</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
--- 176,195 ----
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff333333</color>
|
||||
! <color name="primary_500_alpha_20">#330f0f0f</color>
|
||||
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||
! <color name="primary_500_alpha_32">#510f0f0f</color>
|
||||
! <color name="primary_500_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff000000</color>
|
||||
! <color name="primary_600_alpha_60">#99000000</color>
|
||||
! <color name="primary_630">#ff000000</color>
|
||||
! <color name="primary_630_alpha_60">#99000000</color>
|
||||
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff000000</color>
|
||||
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
***************
|
||||
*** 224,232 ****
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff738bd7</color>
|
||||
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
--- 224,232 ----
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff9c4249</color>
|
||||
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||
! <color name="purple_brand_dark">#ff000000</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
***************
|
||||
*** 291,297 ****
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6616161</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
--- 291,297 ----
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6000000</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
diff -crB com.discord-1020-base/res/values/styles.xml com.discord-1020/res/values/styles.xml
|
||||
*** com.discord-1020-base/res/values/styles.xml 2020-01-12 11:58:55.240670624 +0300
|
||||
--- com.discord-1020/res/values/styles.xml 2020-01-12 12:46:14.510949392 +0300
|
||||
***************
|
||||
*** 392,398 ****
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/primary_630</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
--- 392,398 ----
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/primary_630</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
***************
|
||||
*** 404,418 ****
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
! <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_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||||
--- 404,418 ----
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
! <item name="theme_chat_spoiler_bg">@color/primary_500</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_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||||
***************
|
||||
*** 471,477 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
--- 471,477 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
***************
|
||||
*** 501,507 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||
--- 501,507 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||
diff -crB com.discord-1020-base/smali/com/discord/app/AppActivity$d.smali com.discord-1020/smali/com/discord/app/AppActivity$d.smali
|
||||
*** com.discord-1020-base/smali/com/discord/app/AppActivity$d.smali 2020-01-12 11:58:56.794012599 +0300
|
||||
--- com.discord-1020/smali/com/discord/app/AppActivity$d.smali 2020-01-12 12:30:53.965274726 +0300
|
||||
***************
|
||||
*** 115,121 ****
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f06017e
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
--- 115,121 ----
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060021
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
|
||||
|
|
@ -1,283 +0,0 @@
|
|||
diff -crB from/res/drawable/drawable_overlay_channels_active_dark.xml to/res/drawable/drawable_overlay_channels_active_dark.xml
|
||||
*** from/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-28 13:24:30.393348991 +0000
|
||||
--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-28 13:25:12.890094953 +0000
|
||||
***************
|
||||
*** 3,9 ****
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="#ff42464d" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
--- 3,9 ----
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_500" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
diff -crB from/res/values/colors.xml to/res/values/colors.xml
|
||||
*** from/res/values/colors.xml 2020-01-28 13:24:31.310017355 +0000
|
||||
--- to/res/values/colors.xml 2020-01-28 13:26:33.523581842 +0000
|
||||
***************
|
||||
*** 94,100 ****
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
--- 94,100 ----
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff000000</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
***************
|
||||
*** 105,112 ****
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff36393e</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_dark_default_color_background">#ff121212</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
--- 105,112 ----
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff000000</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_dark_default_color_background">#ff121212</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
***************
|
||||
*** 163,170 ****
|
||||
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||
<color name="grey_4">#ff949494</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
! <color name="grey_account">#ff282b30</color>
|
||||
! <color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
<color name="hypesquad_house_1">#ff9c84ef</color>
|
||||
--- 163,170 ----
|
||||
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||||
<color name="grey_4">#ff949494</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
! <color name="grey_account">#ff000000</color>
|
||||
! <color name="grey_unread">#ff000000</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
<color name="hypesquad_house_1">#ff9c84ef</color>
|
||||
***************
|
||||
*** 174,180 ****
|
||||
<color name="hypesquad_house_3">#ff45ddc0</color>
|
||||
<color name="hypesquad_house_3_500">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff00b0f4</color>
|
||||
<color name="link_100">#fff2fbfe</color>
|
||||
<color name="link_130">#ffe8f8fe</color>
|
||||
<color name="link_160">#ffdaf4fd</color>
|
||||
--- 174,180 ----
|
||||
<color name="hypesquad_house_3">#ff45ddc0</color>
|
||||
<color name="hypesquad_house_3_500">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff50f148</color>
|
||||
<color name="link_100">#fff2fbfe</color>
|
||||
<color name="link_130">#ffe8f8fe</color>
|
||||
<color name="link_160">#ffdaf4fd</color>
|
||||
***************
|
||||
*** 263,282 ****
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff4f545c</color>
|
||||
! <color name="primary_500_alpha_20">#334f545c</color>
|
||||
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||
! <color name="primary_500_alpha_32">#514f545c</color>
|
||||
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff36393f</color>
|
||||
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||
! <color name="primary_630">#ff2f3136</color>
|
||||
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff202225</color>
|
||||
! <color name="primary_700_alpha_60">#99202225</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
--- 263,282 ----
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff333333</color>
|
||||
! <color name="primary_500_alpha_20">#330f0f0f</color>
|
||||
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||
! <color name="primary_500_alpha_32">#510f0f0f</color>
|
||||
! <color name="primary_500_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff000000</color>
|
||||
! <color name="primary_600_alpha_60">#99000000</color>
|
||||
! <color name="primary_630">#ff000000</color>
|
||||
! <color name="primary_630_alpha_60">#99000000</color>
|
||||
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff000000</color>
|
||||
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
***************
|
||||
*** 347,355 ****
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff738bd7</color>
|
||||
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
--- 347,355 ----
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff9c4249</color>
|
||||
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||
! <color name="purple_brand_dark">#ff000000</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
***************
|
||||
*** 488,494 ****
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6616161</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
--- 488,494 ----
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6000000</color>
|
||||
<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 2020-01-28 13:24:31.173350435 +0000
|
||||
--- to/res/values/styles.xml 2020-01-28 13:25:12.893428292 +0000
|
||||
***************
|
||||
*** 393,399 ****
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/primary_630</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
--- 393,399 ----
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/primary_630</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
***************
|
||||
*** 405,419 ****
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
! <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_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||||
--- 405,419 ----
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
! <item name="theme_chat_spoiler_bg">@color/primary_500</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_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||||
***************
|
||||
*** 834,840 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
--- 834,840 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
***************
|
||||
*** 864,870 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||||
--- 864,870 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.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 2020-01-28 13:24:33.246687610 +0000
|
||||
--- to/smali/com/discord/app/AppActivity$d.smali 2020-01-28 13:26:55.210290440 +0000
|
||||
***************
|
||||
*** 115,121 ****
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060243
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
--- 115,121 ----
|
||||
.line 7
|
||||
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||||
|
||||
! const v1, 0x7f060021
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
|
|
@ -1,275 +0,0 @@
|
|||
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-11-26 10:48:43.112812730 +0300
|
||||
--- to/res/drawable/drawable_overlay_channels_active.xml 2019-11-26 10:50:03.879836050 +0300
|
||||
***************
|
||||
*** 3,9 ****
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_500_alpha_60" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
--- 3,9 ----
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_700_alpha_60" />
|
||||
<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-11-26 10:48:44.109483795 +0300
|
||||
--- to/res/values/colors.xml 2019-11-26 10:50:03.879836050 +0300
|
||||
***************
|
||||
*** 50,56 ****
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
--- 50,56 ----
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff000000</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
***************
|
||||
*** 61,68 ****
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff36393e</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_default_color_primary">#ff3f51b5</color>
|
||||
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||
--- 61,68 ----
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff000000</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_default_color_primary">#ff3f51b5</color>
|
||||
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||
***************
|
||||
*** 96,104 ****
|
||||
<color name="grey_6">#ff4f545c</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||
! <color name="grey_account">#ff282b30</color>
|
||||
! <color name="grey_channels">#ff2e3136</color>
|
||||
! <color name="grey_guilds">#ff1e2124</color>
|
||||
<color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
--- 96,104 ----
|
||||
<color name="grey_6">#ff4f545c</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||
! <color name="grey_account">#ff000000</color>
|
||||
! <color name="grey_channels">#ff000000</color>
|
||||
! <color name="grey_guilds">#ff000000</color>
|
||||
<color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
***************
|
||||
*** 106,112 ****
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff00b0f4</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
--- 106,112 ----
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff50f148</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
***************
|
||||
*** 149,166 ****
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff4f545c</color>
|
||||
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff36393f</color>
|
||||
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||
! <color name="primary_630">#ff2f3136</color>
|
||||
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff202225</color>
|
||||
! <color name="primary_700_alpha_60">#99202225</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
--- 149,166 ----
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff0f0f0f</color>
|
||||
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||
! <color name="primary_500_alpha_60">#99404040</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff000000</color>
|
||||
! <color name="primary_600_alpha_60">#99000000</color>
|
||||
! <color name="primary_630">#ff000000</color>
|
||||
! <color name="primary_630_alpha_60">#99000000</color>
|
||||
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff0f0f0f</color>
|
||||
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
***************
|
||||
*** 191,199 ****
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff738bd7</color>
|
||||
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
--- 191,199 ----
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff9c4249</color>
|
||||
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||
! <color name="purple_brand_dark">#ff000000</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
***************
|
||||
*** 255,261 ****
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6616161</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
--- 255,261 ----
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6000000</color>
|
||||
<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-11-26 10:48:43.946149741 +0300
|
||||
--- to/res/values/styles.xml 2019-11-26 10:50:03.879836050 +0300
|
||||
***************
|
||||
*** 373,379 ****
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/grey_channels</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
--- 373,379 ----
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/grey_channels</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
***************
|
||||
*** 385,396 ****
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
--- 385,396 ----
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
***************
|
||||
*** 453,459 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
--- 453,459 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
***************
|
||||
*** 483,489 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
|
||||
--- 483,489 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</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-11-26 10:48:45.832824734 +0300
|
||||
--- to/smali/com/discord/app/AppActivity$d.smali 2019-11-26 10:50:03.879836050 +0300
|
||||
***************
|
||||
*** 113,119 ****
|
||||
|
||||
check-cast v0, Landroid/app/Activity;
|
||||
|
||||
! const v1, 0x7f060135
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
--- 113,119 ----
|
||||
|
||||
check-cast v0, Landroid/app/Activity;
|
||||
|
||||
! const v1, 0x7f060021
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
|
|
@ -1,275 +0,0 @@
|
|||
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-11-26 10:48:43.112812730 +0300
|
||||
--- to/res/drawable/drawable_overlay_channels_active.xml 2019-11-26 10:50:03.879836050 +0300
|
||||
***************
|
||||
*** 3,9 ****
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_500_alpha_60" />
|
||||
<corners android:radius="4.0dip" />
|
||||
</shape>
|
||||
</item>
|
||||
--- 3,9 ----
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="8.0dip" android:right="8.0dip">
|
||||
<shape android:shape="rectangle">
|
||||
! <solid android:color="@color/primary_700_alpha_60" />
|
||||
<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-11-26 10:48:44.109483795 +0300
|
||||
--- to/res/values/colors.xml 2019-11-26 10:50:03.879836050 +0300
|
||||
***************
|
||||
*** 50,56 ****
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff1d1d1d</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
--- 50,56 ----
|
||||
<color name="cardview_shadow_start_color">#37000000</color>
|
||||
<color name="code">#ff657b83</color>
|
||||
<color name="colorPrimary">#ff333333</color>
|
||||
! <color name="colorPrimaryDark">#ff000000</color>
|
||||
<color name="color_clicked_darker">#40000000</color>
|
||||
<color name="color_clicked_lighter">#40ffffff</color>
|
||||
<color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
|
||||
***************
|
||||
*** 61,68 ****
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff36393e</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_default_color_primary">#ff3f51b5</color>
|
||||
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||
--- 61,68 ----
|
||||
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||||
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||||
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||||
! <color name="dark_grey_2">#ff000000</color>
|
||||
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||||
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||||
<color name="design_default_color_primary">#ff3f51b5</color>
|
||||
<color name="design_default_color_primary_dark">#ff303f9f</color>
|
||||
***************
|
||||
*** 96,104 ****
|
||||
<color name="grey_6">#ff4f545c</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||
! <color name="grey_account">#ff282b30</color>
|
||||
! <color name="grey_channels">#ff2e3136</color>
|
||||
! <color name="grey_guilds">#ff1e2124</color>
|
||||
<color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
--- 96,104 ----
|
||||
<color name="grey_6">#ff4f545c</color>
|
||||
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||||
<color name="grey_6_alpha_30">#4d4f545c</color>
|
||||
! <color name="grey_account">#ff000000</color>
|
||||
! <color name="grey_channels">#ff000000</color>
|
||||
! <color name="grey_guilds">#ff000000</color>
|
||||
<color name="grey_unread">#ff8a8e94</color>
|
||||
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||||
<color name="highlighted_text_material_light">#66009688</color>
|
||||
***************
|
||||
*** 106,112 ****
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff00b0f4</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
--- 106,112 ----
|
||||
<color name="hypesquad_house2">#fff47b67</color>
|
||||
<color name="hypesquad_house3">#ff45ddc0</color>
|
||||
<color name="league_of_legends">#ff021f25</color>
|
||||
! <color name="link">#ff50f148</color>
|
||||
<color name="link_light">#ff0067e0</color>
|
||||
<color name="material_blue_grey_800">#ff37474f</color>
|
||||
<color name="material_blue_grey_900">#ff263238</color>
|
||||
***************
|
||||
*** 149,166 ****
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff4f545c</color>
|
||||
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||||
! <color name="primary_500_alpha_60">#994f545c</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff36393f</color>
|
||||
! <color name="primary_600_alpha_60">#9936393f</color>
|
||||
! <color name="primary_630">#ff2f3136</color>
|
||||
! <color name="primary_630_alpha_60">#992f3136</color>
|
||||
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff202225</color>
|
||||
! <color name="primary_700_alpha_60">#99202225</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
--- 149,166 ----
|
||||
<color name="primary_400">#ff72767d</color>
|
||||
<color name="primary_400_alpha_30">#4d72767d</color>
|
||||
<color name="primary_400_alpha_60">#9972767d</color>
|
||||
! <color name="primary_500">#ff0f0f0f</color>
|
||||
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||||
! <color name="primary_500_alpha_60">#99404040</color>
|
||||
<color name="primary_560">#ff40444b</color>
|
||||
! <color name="primary_600">#ff000000</color>
|
||||
! <color name="primary_600_alpha_60">#99000000</color>
|
||||
! <color name="primary_630">#ff000000</color>
|
||||
! <color name="primary_630_alpha_60">#99000000</color>
|
||||
! <color name="primary_630_alpha_90">#e6000000</color>
|
||||
<color name="primary_660">#ff292b2f</color>
|
||||
! <color name="primary_700">#ff0f0f0f</color>
|
||||
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||||
<color name="primary_800">#ff18191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
<color name="primary_800_alpha_90">#e618191c</color>
|
||||
***************
|
||||
*** 191,199 ****
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff738bd7</color>
|
||||
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||||
! <color name="purple_brand_dark">#ff697ec4</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
--- 191,199 ----
|
||||
<color name="primary_text_default_material_light">#de000000</color>
|
||||
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||||
<color name="primary_text_disabled_material_light">#39000000</color>
|
||||
! <color name="purple_brand">#ff9c4249</color>
|
||||
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||||
! <color name="purple_brand_dark">#ff000000</color>
|
||||
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||||
<color name="purple_brand_notification">#ff5161ff</color>
|
||||
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||||
***************
|
||||
*** 255,261 ****
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6616161</color>
|
||||
<color name="tooltip_background_light">#e6ffffff</color>
|
||||
<color name="transparent">@android:color/transparent</color>
|
||||
<color name="twitch">#ff593695</color>
|
||||
--- 255,261 ----
|
||||
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||||
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||||
! <color name="tooltip_background_dark">#e6000000</color>
|
||||
<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-11-26 10:48:43.946149741 +0300
|
||||
--- to/res/values/styles.xml 2019-11-26 10:50:03.879836050 +0300
|
||||
***************
|
||||
*** 373,379 ****
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/grey_channels</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
--- 373,379 ----
|
||||
<item name="tabTextColor">@color/white_alpha_40</item>
|
||||
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||||
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||||
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||||
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||||
<item name="theme_chat_code">@color/grey_channels</item>
|
||||
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||||
***************
|
||||
*** 385,396 ****
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
--- 385,396 ----
|
||||
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||||
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||||
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||||
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||||
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||||
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||||
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||||
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||||
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||||
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||||
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||||
<item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||||
***************
|
||||
*** 453,459 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
--- 453,459 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||||
<item name="colorAccent">@color/brand_600</item>
|
||||
***************
|
||||
*** 483,489 ****
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||||
</style>
|
||||
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||||
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
|
||||
--- 483,489 ----
|
||||
<item name="colorControlActivated">@color/brand_500</item>
|
||||
<item name="colorControlNormal">@color/primary_100</item>
|
||||
<item name="colorPrimary">@color/primary_600</item>
|
||||
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||||
</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-11-26 10:48:45.832824734 +0300
|
||||
--- to/smali/com/discord/app/AppActivity$d.smali 2019-11-26 10:50:03.879836050 +0300
|
||||
***************
|
||||
*** 113,119 ****
|
||||
|
||||
check-cast v0, Landroid/app/Activity;
|
||||
|
||||
! const v1, 0x7f060135
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
--- 113,119 ----
|
||||
|
||||
check-cast v0, Landroid/app/Activity;
|
||||
|
||||
! const v1, 0x7f060021
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue