Merge branch 'master' of https://gitdab.com/distok/cutthecord into patch-4
This commit is contained in:
commit
b613acc5fe
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
Modular Client Mod for Discord's Android app.
|
||||
|
||||
**Latest supported Discord Android version:** 36.3 (1243), released on 2020-08-20.
|
||||
**Latest supported Discord Android version:** 42.0 (1281), released on 2020-09-29.
|
||||
|
||||
New patch development will be done for the latest supported version.
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,66 @@
|
|||
diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml
|
||||
*** from/res/menu/menu_chat_toolbar.xml 2020-08-20 11:50:15.090000000 +0300
|
||||
--- to/res/menu/menu_chat_toolbar.xml 2020-08-20 11:55:29.120000000 +0300
|
||||
***************
|
||||
*** 1,11 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
\ No newline at end of file
|
||||
--- 1,11 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
diff -crB from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali
|
||||
*** from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:50:18.180000000 +0300
|
||||
--- to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:53:49.170000000 +0300
|
||||
***************
|
||||
*** 119,125 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 119,125 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
***************
|
||||
*** 140,146 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 140,146 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml
|
||||
*** from/res/menu/menu_chat_toolbar.xml 2020-08-20 11:50:15.090000000 +0300
|
||||
--- to/res/menu/menu_chat_toolbar.xml 2020-08-20 11:55:29.120000000 +0300
|
||||
***************
|
||||
*** 1,11 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
\ No newline at end of file
|
||||
--- 1,11 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
diff -crB from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali
|
||||
*** from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:50:18.180000000 +0300
|
||||
--- to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:53:49.170000000 +0300
|
||||
***************
|
||||
*** 119,125 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 119,125 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
***************
|
||||
*** 140,146 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 140,146 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml
|
||||
*** from/res/menu/menu_chat_toolbar.xml 2020-08-20 11:50:15.090000000 +0300
|
||||
--- to/res/menu/menu_chat_toolbar.xml 2020-08-20 11:55:29.120000000 +0300
|
||||
***************
|
||||
*** 1,11 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
\ No newline at end of file
|
||||
--- 1,11 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
diff -crB from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali
|
||||
*** from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:50:18.180000000 +0300
|
||||
--- to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:53:49.170000000 +0300
|
||||
***************
|
||||
*** 119,125 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 119,125 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
***************
|
||||
*** 140,146 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 140,146 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml
|
||||
*** from/res/menu/menu_chat_toolbar.xml 2020-08-20 11:50:15.090000000 +0300
|
||||
--- to/res/menu/menu_chat_toolbar.xml 2020-08-20 11:55:29.120000000 +0300
|
||||
***************
|
||||
*** 1,11 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
\ No newline at end of file
|
||||
--- 1,11 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
diff -crB from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali
|
||||
*** from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:50:18.180000000 +0300
|
||||
--- to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:53:49.170000000 +0300
|
||||
***************
|
||||
*** 119,125 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 119,125 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
***************
|
||||
*** 140,146 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 140,146 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml
|
||||
*** from/res/menu/menu_chat_toolbar.xml 2020-08-20 11:50:15.090000000 +0300
|
||||
--- to/res/menu/menu_chat_toolbar.xml 2020-08-20 11:55:29.120000000 +0300
|
||||
***************
|
||||
*** 1,11 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
\ No newline at end of file
|
||||
--- 1,11 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
diff -crB from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali
|
||||
*** from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:50:18.180000000 +0300
|
||||
--- to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:53:49.170000000 +0300
|
||||
***************
|
||||
*** 119,125 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 119,125 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
***************
|
||||
*** 140,146 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 140,146 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml
|
||||
*** from/res/menu/menu_chat_toolbar.xml 2020-08-20 11:50:15.090000000 +0300
|
||||
--- to/res/menu/menu_chat_toolbar.xml 2020-08-20 11:55:29.120000000 +0300
|
||||
***************
|
||||
*** 1,11 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
\ No newline at end of file
|
||||
--- 1,11 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
diff -crB from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali
|
||||
*** from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:50:18.180000000 +0300
|
||||
--- to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:53:49.170000000 +0300
|
||||
***************
|
||||
*** 119,125 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 119,125 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
***************
|
||||
*** 140,146 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 140,146 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml
|
||||
*** from/res/menu/menu_chat_toolbar.xml 2020-08-20 11:50:15.090000000 +0300
|
||||
--- to/res/menu/menu_chat_toolbar.xml 2020-08-20 11:55:29.120000000 +0300
|
||||
***************
|
||||
*** 1,11 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
\ No newline at end of file
|
||||
--- 1,11 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
diff -crB from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali
|
||||
*** from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:50:18.180000000 +0300
|
||||
--- to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:53:49.170000000 +0300
|
||||
***************
|
||||
*** 119,125 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 119,125 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
***************
|
||||
*** 140,146 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 140,146 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml
|
||||
*** from/res/menu/menu_chat_toolbar.xml 2020-08-20 11:50:15.090000000 +0300
|
||||
--- to/res/menu/menu_chat_toolbar.xml 2020-08-20 11:55:29.120000000 +0300
|
||||
***************
|
||||
*** 1,11 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
\ No newline at end of file
|
||||
--- 1,11 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
diff -crB from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali
|
||||
*** from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:50:18.180000000 +0300
|
||||
--- to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:53:49.170000000 +0300
|
||||
***************
|
||||
*** 119,125 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 119,125 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
***************
|
||||
*** 140,146 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 140,146 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml
|
||||
*** from/res/menu/menu_chat_toolbar.xml 2020-08-20 11:50:15.090000000 +0300
|
||||
--- to/res/menu/menu_chat_toolbar.xml 2020-08-20 11:55:29.120000000 +0300
|
||||
***************
|
||||
*** 1,11 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
\ No newline at end of file
|
||||
--- 1,11 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
diff -crB from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali
|
||||
*** from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:50:18.180000000 +0300
|
||||
--- to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:53:49.170000000 +0300
|
||||
***************
|
||||
*** 119,125 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 119,125 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
***************
|
||||
*** 140,146 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 140,146 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml
|
||||
*** from/res/menu/menu_chat_toolbar.xml 2020-08-20 11:50:15.090000000 +0300
|
||||
--- to/res/menu/menu_chat_toolbar.xml 2020-08-20 11:55:29.120000000 +0300
|
||||
***************
|
||||
*** 1,11 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
\ No newline at end of file
|
||||
--- 1,11 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
diff -crB from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali
|
||||
*** from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:50:18.180000000 +0300
|
||||
--- to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:53:49.170000000 +0300
|
||||
***************
|
||||
*** 119,125 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 119,125 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
***************
|
||||
*** 140,146 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 140,146 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml
|
||||
*** from/res/menu/menu_chat_toolbar.xml 2020-08-20 11:50:15.090000000 +0300
|
||||
--- to/res/menu/menu_chat_toolbar.xml 2020-08-20 11:55:29.120000000 +0300
|
||||
***************
|
||||
*** 1,11 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
\ No newline at end of file
|
||||
--- 1,11 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
! <item android:icon="@drawable/ic_call_24dp" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
<item android:icon="@drawable/ic_call_disconnect_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:iconTint="@color/status_red" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_group_add_white_24dp" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:iconTint="?colorInteractiveNormal" app:showAsAction="ifRoom" />
|
||||
<item android:icon="@drawable/ic_header_members_add_white_24dp" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! <item android:icon="@drawable/ic_videocam_white_24dp" android:id="@id/menu_chat_start_video_call" android:visible="false" android:title="@string/start_video_call" app:iconTint="?colorInteractiveNormal" app:showAsAction="never" />
|
||||
! <item android:icon="@drawable/ic_search_white_24dp" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
<item android:icon="@drawable/ic_members_24dp" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:iconTint="?colorInteractiveNormal" app:showAsAction="always" />
|
||||
! </menu>
|
||||
diff -crB from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali
|
||||
*** from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:50:18.180000000 +0300
|
||||
--- to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:53:49.170000000 +0300
|
||||
***************
|
||||
*** 119,125 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 119,125 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 5
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
***************
|
||||
*** 140,146 ****
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
--- 140,146 ----
|
||||
|
||||
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
|
||||
|
||||
.line 7
|
||||
invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
|
||||
|
|
@ -11,4 +11,14 @@ This patch replaces the call button on DM headers with search button. The call b
|
|||
- 34.3
|
||||
- 35.0-alpha1
|
||||
- 36.3
|
||||
- 36.5
|
||||
- 38.0
|
||||
- 38.1
|
||||
- 40.04
|
||||
- 41.02
|
||||
- 41.05
|
||||
- 41.06
|
||||
- 41.10
|
||||
- 41.11
|
||||
- 42.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
#!/bin/bash
|
||||
\cp "$1/emoji_2122_fe0f.png" res/raw/emoji_2122_fe0f.png
|
||||
\cp "$1/emoji_ae_fe0f.png" res/raw/emoji_ae_fe0f.png
|
||||
\rm res/raw/emoji_2122_fe0f.webp
|
||||
\rm res/raw/emoji_ae_fe0f.webp
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ replace_counter = 0
|
|||
|
||||
# Go through each discord emoji, and clean their names
|
||||
for emoji in discord_emojis:
|
||||
clean_discord_emoji = clean_emoji_name("{}.png".format(os.path.splitext(emoji)[0]))
|
||||
clean_discord_emoji = clean_emoji_name(emoji)
|
||||
|
||||
# Check if said clean name of emoji is in clean blobmoji list
|
||||
if clean_discord_emoji in clean_blobmojis:
|
||||
|
|
|
|||
|
|
@ -0,0 +1,247 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-08-22 13:27:00.060000000 +0300
|
||||
--- to/AndroidManifest.xml 2020-08-22 13:27:13.820000000 +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="1246" platformBuildVersionName="36.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="1246CTCBUILD" platformBuildVersionName="36.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"/>
|
||||
***************
|
||||
*** 21,33 ****
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <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">
|
||||
--- 21,33 ----
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <application android:allowBackup="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: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">
|
||||
***************
|
||||
*** 126,132 ****
|
||||
<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"/>
|
||||
--- 126,132 ----
|
||||
<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.CTCBRANCH.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 150,156 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<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"/>
|
||||
--- 150,156 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<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"/>
|
||||
***************
|
||||
*** 170,176 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar" 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"/>
|
||||
--- 170,176 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar" 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"/>
|
||||
***************
|
||||
*** 188,201 ****
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
--- 188,201 ----
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
***************
|
||||
*** 243,246 ****
|
||||
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 243,246 ----
|
||||
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
|
||||
<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-08-22 13:24:28.700000000 +0300
|
||||
--- to/apktool.yml 2020-08-22 13:27:13.820000000 +0300
|
||||
***************
|
||||
*** 3106,3110 ****
|
||||
tag: null
|
||||
version: 2.4.2-662d58-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1246'
|
||||
! versionName: '36.5'
|
||||
--- 3106,3110 ----
|
||||
tag: null
|
||||
version: 2.4.2-662d58-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1246CTCBUILD'
|
||||
! versionName: '36.5-cutthecord-CTCBUILD'
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-08-22 13:24:21.290000000 +0300
|
||||
--- to/res/values/strings.xml 2020-08-22 13:27:13.820000000 +0300
|
||||
***************
|
||||
*** 1478,1484 ****
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1478,1484 ----
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 4137,4143 ****
|
||||
<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_muted">Notifications, muted</string>
|
||||
--- 4137,4143 ----
|
||||
<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_muted">Notifications, muted</string>
|
||||
***************
|
||||
*** 5481,5487 ****
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</string>
|
||||
--- 5481,5487 ----
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</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-08-22 13:24:23.970000000 +0300
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-08-22 13:27:13.820000000 +0300
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discord.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;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-08-22 13:24:25.510000000 +0300
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-08-22 13:27:13.820000000 +0300
|
||||
***************
|
||||
*** 63,69 ****
|
||||
|
||||
invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://support.discord.com"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
--- 63,69 ----
|
||||
|
||||
invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://gitdab.com/distok/cutthecord"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
|
|
@ -0,0 +1,250 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-08-27 13:06:08.920000000 +0300
|
||||
--- to/AndroidManifest.xml 2020-08-27 13:06:21.700000000 +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="1249" platformBuildVersionName="38.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="1249CTCBUILD" platformBuildVersionName="38.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"/>
|
||||
***************
|
||||
*** 21,33 ****
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <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">
|
||||
--- 21,33 ----
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <application android:allowBackup="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: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">
|
||||
***************
|
||||
*** 131,137 ****
|
||||
<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"/>
|
||||
--- 131,137 ----
|
||||
<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.CTCBRANCH.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 155,161 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<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"/>
|
||||
--- 155,161 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<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"/>
|
||||
***************
|
||||
*** 175,181 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar" 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"/>
|
||||
--- 175,181 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar" 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"/>
|
||||
***************
|
||||
*** 193,206 ****
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
--- 193,206 ----
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
***************
|
||||
*** 248,251 ****
|
||||
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 248,251 ----
|
||||
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
Only in to: AndroidManifest.xml.orig
|
||||
diff -crB from/apktool.yml to/apktool.yml
|
||||
*** from/apktool.yml 2020-08-27 13:05:49.780000000 +0300
|
||||
--- to/apktool.yml 2020-08-27 13:06:21.700000000 +0300
|
||||
***************
|
||||
*** 3106,3110 ****
|
||||
tag: null
|
||||
version: 2.4.2-d3f9d5-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1249'
|
||||
! versionName: '38.0'
|
||||
--- 3106,3110 ----
|
||||
tag: null
|
||||
version: 2.4.2-d3f9d5-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1249CTCBUILD'
|
||||
! versionName: '38.0-cutthecord-CTCBUILD'
|
||||
Only in to: apktool.yml.orig
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-08-27 13:05:43.460000000 +0300
|
||||
--- to/res/values/strings.xml 2020-08-27 13:06:21.700000000 +0300
|
||||
***************
|
||||
*** 1479,1485 ****
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1479,1485 ----
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 4153,4159 ****
|
||||
<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_muted">Notifications, muted</string>
|
||||
--- 4153,4159 ----
|
||||
<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_muted">Notifications, muted</string>
|
||||
***************
|
||||
*** 5497,5503 ****
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</string>
|
||||
--- 5497,5503 ----
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</string>
|
||||
Only in to/res/values: strings.xml.orig
|
||||
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-08-27 13:05:45.880000000 +0300
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-08-27 13:06:21.700000000 +0300
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discord.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;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-08-27 13:05:47.170000000 +0300
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-08-27 13:06:21.700000000 +0300
|
||||
***************
|
||||
*** 63,69 ****
|
||||
|
||||
invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://support.discord.com"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
--- 63,69 ----
|
||||
|
||||
invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://gitdab.com/distok/cutthecord"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
|
|
@ -0,0 +1,247 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-09-07 10:45:20.635238621 +0100
|
||||
--- to/AndroidManifest.xml 2020-09-07 10:52:46.579530342 +0100
|
||||
***************
|
||||
*** 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="1251" platformBuildVersionName="38.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="1251CTCBUILD" platformBuildVersionName="38.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"/>
|
||||
***************
|
||||
*** 21,33 ****
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <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">
|
||||
--- 21,33 ----
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <application android:allowBackup="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: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">
|
||||
***************
|
||||
*** 131,137 ****
|
||||
<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"/>
|
||||
--- 131,137 ----
|
||||
<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.CTCBRANCH.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 155,161 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:foregroundServiceType="mediaProjection" 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"/>
|
||||
--- 155,161 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:foregroundServiceType="mediaProjection" 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"/>
|
||||
***************
|
||||
*** 175,181 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar" 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"/>
|
||||
--- 175,181 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar" 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"/>
|
||||
***************
|
||||
*** 193,206 ****
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
--- 193,206 ----
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
***************
|
||||
*** 248,251 ****
|
||||
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 248,251 ----
|
||||
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
|
||||
<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-09-07 10:44:51.821479225 +0100
|
||||
--- to/apktool.yml 2020-09-07 10:52:07.477854619 +0100
|
||||
***************
|
||||
*** 3106,3110 ****
|
||||
tag: null
|
||||
version: 2.4.2-f3136b-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1251'
|
||||
! versionName: '38.1'
|
||||
--- 3106,3110 ----
|
||||
tag: null
|
||||
version: 2.4.2-f3136b-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1251CTCBUILD'
|
||||
! versionName: '38.1-cutthecord-CTCBUILD'
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-09-07 10:44:46.955519874 +0100
|
||||
--- to/res/values/strings.xml 2020-09-07 10:52:07.477854619 +0100
|
||||
***************
|
||||
*** 1481,1487 ****
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1481,1487 ----
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 4197,4203 ****
|
||||
<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_muted">Notifications, muted</string>
|
||||
--- 4197,4203 ----
|
||||
<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_muted">Notifications, muted</string>
|
||||
***************
|
||||
*** 5541,5547 ****
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</string>
|
||||
--- 5541,5547 ----
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</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-09-07 10:44:49.207501061 +0100
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-09-07 10:52:07.479854603 +0100
|
||||
***************
|
||||
*** 78,84 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discord.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 78,84 ----
|
||||
.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;
|
||||
diff -crB from/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali to/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali
|
||||
*** from/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-09-07 10:44:49.757496466 +0100
|
||||
--- to/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-09-07 10:52:25.355706339 +0100
|
||||
***************
|
||||
*** 63,69 ****
|
||||
|
||||
invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://support.discord.com"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
--- 63,69 ----
|
||||
|
||||
invoke-static {v1, p1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://gitdab.com/distok/cutthecord"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
|
|
@ -0,0 +1,247 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-09-08 10:41:04.619582291 +0100
|
||||
--- to/AndroidManifest.xml 2020-09-08 10:46:43.143808833 +0100
|
||||
***************
|
||||
*** 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="1252" platformBuildVersionName="38.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="1252CTCBUILD" platformBuildVersionName="38.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"/>
|
||||
***************
|
||||
*** 21,33 ****
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <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">
|
||||
--- 21,33 ----
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <application android:allowBackup="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: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">
|
||||
***************
|
||||
*** 131,137 ****
|
||||
<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"/>
|
||||
--- 131,137 ----
|
||||
<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.CTCBRANCH.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 155,161 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:foregroundServiceType="mediaProjection" 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"/>
|
||||
--- 155,161 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:foregroundServiceType="mediaProjection" 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"/>
|
||||
***************
|
||||
*** 175,181 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar" 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"/>
|
||||
--- 175,181 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar" 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"/>
|
||||
***************
|
||||
*** 193,206 ****
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
--- 193,206 ----
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
***************
|
||||
*** 248,251 ****
|
||||
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 248,251 ----
|
||||
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
|
||||
<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-09-08 10:40:49.023479712 +0100
|
||||
--- to/apktool.yml 2020-09-08 10:46:27.839708174 +0100
|
||||
***************
|
||||
*** 3106,3110 ****
|
||||
tag: null
|
||||
version: 2.4.2-f3136b-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1252'
|
||||
! versionName: '38.1'
|
||||
--- 3106,3110 ----
|
||||
tag: null
|
||||
version: 2.4.2-f3136b-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1252CTCBUILD'
|
||||
! versionName: '38.1-cutthecord-CTCBUILD'
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-09-08 10:40:44.291448588 +0100
|
||||
--- to/res/values/strings.xml 2020-09-08 10:46:27.841708187 +0100
|
||||
***************
|
||||
*** 1481,1487 ****
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1481,1487 ----
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 4197,4203 ****
|
||||
<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_muted">Notifications, muted</string>
|
||||
--- 4197,4203 ----
|
||||
<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_muted">Notifications, muted</string>
|
||||
***************
|
||||
*** 5541,5547 ****
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</string>
|
||||
--- 5541,5547 ----
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</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-09-08 10:40:46.471462927 +0100
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-09-08 10:46:27.841708187 +0100
|
||||
***************
|
||||
*** 76,82 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discord.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;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-09-08 10:40:47.303468399 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-09-08 10:46:27.841708187 +0100
|
||||
***************
|
||||
*** 63,69 ****
|
||||
|
||||
invoke-static {v1, p1}, Lk0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://support.discord.com"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
--- 63,69 ----
|
||||
|
||||
invoke-static {v1, p1}, Lk0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://gitdab.com/distok/cutthecord"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
|
|
@ -0,0 +1,247 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-09-13 11:50:05.838367765 +0100
|
||||
--- to/AndroidManifest.xml 2020-09-13 12:11:56.159839947 +0100
|
||||
***************
|
||||
*** 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="1259" platformBuildVersionName="40.04">
|
||||
<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="1259CTCBUILD" platformBuildVersionName="40.04-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"/>
|
||||
***************
|
||||
*** 21,33 ****
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <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">
|
||||
--- 21,33 ----
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <application android:allowBackup="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: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">
|
||||
***************
|
||||
*** 131,137 ****
|
||||
<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"/>
|
||||
--- 131,137 ----
|
||||
<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.CTCBRANCH.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 155,161 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:foregroundServiceType="mediaProjection" 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"/>
|
||||
--- 155,161 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:foregroundServiceType="mediaProjection" 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"/>
|
||||
***************
|
||||
*** 177,183 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonKtxRegistrar" 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"/>
|
||||
--- 177,183 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonKtxRegistrar" 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"/>
|
||||
***************
|
||||
*** 195,208 ****
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
--- 195,208 ----
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
***************
|
||||
*** 255,258 ****
|
||||
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 255,258 ----
|
||||
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
|
||||
<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-09-13 11:49:36.315244259 +0100
|
||||
--- to/apktool.yml 2020-09-13 12:11:29.937091265 +0100
|
||||
***************
|
||||
*** 3109,3113 ****
|
||||
tag: null
|
||||
version: 2.4.2-f3136b-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1259'
|
||||
! versionName: '40.04'
|
||||
--- 3109,3113 ----
|
||||
tag: null
|
||||
version: 2.4.2-f3136b-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1259CTCBUILD'
|
||||
! versionName: '40.04-cutthecord-CTCBUILD'
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-09-13 11:49:32.543094689 +0100
|
||||
--- to/res/values/strings.xml 2020-09-13 12:11:29.937091265 +0100
|
||||
***************
|
||||
*** 1500,1506 ****
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1500,1506 ----
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 4251,4257 ****
|
||||
<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_muted">Notifications, muted</string>
|
||||
--- 4251,4257 ----
|
||||
<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_muted">Notifications, muted</string>
|
||||
***************
|
||||
*** 5648,5654 ****
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</string>
|
||||
--- 5648,5654 ----
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</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-09-13 11:49:34.145158952 +0100
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-09-13 12:11:29.937091265 +0100
|
||||
***************
|
||||
*** 78,84 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discord.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 78,84 ----
|
||||
.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;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-09-13 11:49:34.921189685 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-09-13 12:11:29.937091265 +0100
|
||||
***************
|
||||
*** 63,69 ****
|
||||
|
||||
invoke-static {v1, p1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://support.discord.com"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
--- 63,69 ----
|
||||
|
||||
invoke-static {v1, p1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://gitdab.com/distok/cutthecord"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
|
|
@ -0,0 +1,247 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-09-15 09:41:44.156858336 +0100
|
||||
--- to/AndroidManifest.xml 2020-09-15 09:42:34.122941218 +0100
|
||||
***************
|
||||
*** 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="1266" platformBuildVersionName="41.02">
|
||||
<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="1266CTCBUILD" platformBuildVersionName="41.02-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"/>
|
||||
***************
|
||||
*** 21,33 ****
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <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">
|
||||
--- 21,33 ----
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <application android:allowBackup="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: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">
|
||||
***************
|
||||
*** 131,137 ****
|
||||
<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"/>
|
||||
--- 131,137 ----
|
||||
<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.CTCBRANCH.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 155,161 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:foregroundServiceType="mediaProjection" 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"/>
|
||||
--- 155,161 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:foregroundServiceType="mediaProjection" 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"/>
|
||||
***************
|
||||
*** 177,183 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonKtxRegistrar" 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"/>
|
||||
--- 177,183 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonKtxRegistrar" 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"/>
|
||||
***************
|
||||
*** 195,208 ****
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
--- 195,208 ----
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
***************
|
||||
*** 255,258 ****
|
||||
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 255,258 ----
|
||||
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
|
||||
<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-09-15 09:41:33.562840632 +0100
|
||||
--- to/apktool.yml 2020-09-15 09:42:34.122941218 +0100
|
||||
***************
|
||||
*** 3109,3113 ****
|
||||
tag: null
|
||||
version: 2.4.2-f3136b-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1266'
|
||||
! versionName: '41.02'
|
||||
--- 3109,3113 ----
|
||||
tag: null
|
||||
version: 2.4.2-f3136b-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1266CTCBUILD'
|
||||
! versionName: '41.02-cutthecord-CTCBUILD'
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-09-15 09:41:29.864834442 +0100
|
||||
--- to/res/values/strings.xml 2020-09-15 09:42:34.124941222 +0100
|
||||
***************
|
||||
*** 1500,1506 ****
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1500,1506 ----
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 4257,4263 ****
|
||||
<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_muted">Notifications, muted</string>
|
||||
--- 4257,4263 ----
|
||||
<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_muted">Notifications, muted</string>
|
||||
***************
|
||||
*** 5663,5669 ****
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</string>
|
||||
--- 5663,5669 ----
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</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-09-15 09:41:31.412837035 +0100
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-09-15 09:42:34.124941222 +0100
|
||||
***************
|
||||
*** 78,84 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discord.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 78,84 ----
|
||||
.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;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-09-15 09:41:32.130838236 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-09-15 09:42:34.124941222 +0100
|
||||
***************
|
||||
*** 63,69 ****
|
||||
|
||||
invoke-static {v1, p1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://support.discord.com"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
--- 63,69 ----
|
||||
|
||||
invoke-static {v1, p1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://gitdab.com/distok/cutthecord"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
|
|
@ -0,0 +1,247 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-09-16 11:18:20.159713663 +0100
|
||||
--- to/AndroidManifest.xml 2020-09-16 11:19:10.721727252 +0100
|
||||
***************
|
||||
*** 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="1270" platformBuildVersionName="41.05">
|
||||
<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="1270CTCBUILD" platformBuildVersionName="41.05-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"/>
|
||||
***************
|
||||
*** 21,33 ****
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <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">
|
||||
--- 21,33 ----
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <application android:allowBackup="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: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">
|
||||
***************
|
||||
*** 131,137 ****
|
||||
<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"/>
|
||||
--- 131,137 ----
|
||||
<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.CTCBRANCH.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 155,161 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:foregroundServiceType="mediaProjection" 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"/>
|
||||
--- 155,161 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:foregroundServiceType="mediaProjection" 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"/>
|
||||
***************
|
||||
*** 177,183 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonKtxRegistrar" 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"/>
|
||||
--- 177,183 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonKtxRegistrar" 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"/>
|
||||
***************
|
||||
*** 195,208 ****
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
--- 195,208 ----
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
***************
|
||||
*** 255,258 ****
|
||||
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 255,258 ----
|
||||
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
|
||||
<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-09-16 11:18:12.143711874 +0100
|
||||
--- to/apktool.yml 2020-09-16 11:19:10.721727252 +0100
|
||||
***************
|
||||
*** 3109,3113 ****
|
||||
tag: null
|
||||
version: 2.4.2-f3136b-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1270'
|
||||
! versionName: '41.05'
|
||||
--- 3109,3113 ----
|
||||
tag: null
|
||||
version: 2.4.2-f3136b-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1270CTCBUILD'
|
||||
! versionName: '41.05-cutthecord-CTCBUILD'
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-09-16 11:18:08.449711084 +0100
|
||||
--- to/res/values/strings.xml 2020-09-16 11:19:10.723727252 +0100
|
||||
***************
|
||||
*** 1500,1506 ****
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1500,1506 ----
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 4264,4270 ****
|
||||
<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_muted">Notifications, muted</string>
|
||||
--- 4264,4270 ----
|
||||
<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_muted">Notifications, muted</string>
|
||||
***************
|
||||
*** 5670,5676 ****
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</string>
|
||||
--- 5670,5676 ----
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</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-09-16 11:18:09.837711379 +0100
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-09-16 11:19:10.723727252 +0100
|
||||
***************
|
||||
*** 78,84 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discord.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 78,84 ----
|
||||
.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;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-09-16 11:18:10.611711544 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-09-16 11:19:10.723727252 +0100
|
||||
***************
|
||||
*** 63,69 ****
|
||||
|
||||
invoke-static {v1, p1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://support.discord.com"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
--- 63,69 ----
|
||||
|
||||
invoke-static {v1, p1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://gitdab.com/distok/cutthecord"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
|
|
@ -0,0 +1,247 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-09-17 10:21:02.262577335 +0100
|
||||
--- to/AndroidManifest.xml 2020-09-17 10:25:41.437419643 +0100
|
||||
***************
|
||||
*** 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="1273" platformBuildVersionName="41.06">
|
||||
<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="1273CTCBUILD" platformBuildVersionName="41.06-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"/>
|
||||
***************
|
||||
*** 21,33 ****
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <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">
|
||||
--- 21,33 ----
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <application android:allowBackup="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: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">
|
||||
***************
|
||||
*** 131,137 ****
|
||||
<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"/>
|
||||
--- 131,137 ----
|
||||
<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.CTCBRANCH.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 155,161 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:foregroundServiceType="mediaProjection" 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"/>
|
||||
--- 155,161 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:foregroundServiceType="mediaProjection" 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"/>
|
||||
***************
|
||||
*** 177,183 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonKtxRegistrar" 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"/>
|
||||
--- 177,183 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonKtxRegistrar" 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"/>
|
||||
***************
|
||||
*** 195,208 ****
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
--- 195,208 ----
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
***************
|
||||
*** 255,258 ****
|
||||
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 255,258 ----
|
||||
<receiver android:exported="false" android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver"/>
|
||||
<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-09-17 10:20:51.334544380 +0100
|
||||
--- to/apktool.yml 2020-09-17 10:25:41.437419643 +0100
|
||||
***************
|
||||
*** 3109,3113 ****
|
||||
tag: null
|
||||
version: 2.4.2-f3136b-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1273'
|
||||
! versionName: '41.06'
|
||||
--- 3109,3113 ----
|
||||
tag: null
|
||||
version: 2.4.2-f3136b-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1273CTCBUILD'
|
||||
! versionName: '41.06-cutthecord-CTCBUILD'
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-09-17 10:20:47.516532861 +0100
|
||||
--- to/res/values/strings.xml 2020-09-17 10:25:41.439419649 +0100
|
||||
***************
|
||||
*** 1500,1506 ****
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1500,1506 ----
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 4265,4271 ****
|
||||
<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_muted">Notifications, muted</string>
|
||||
--- 4265,4271 ----
|
||||
<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_muted">Notifications, muted</string>
|
||||
***************
|
||||
*** 5671,5677 ****
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</string>
|
||||
--- 5671,5677 ----
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</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-09-17 10:20:49.014537381 +0100
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-09-17 10:25:41.439419649 +0100
|
||||
***************
|
||||
*** 78,84 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discord.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 78,84 ----
|
||||
.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;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-09-17 10:20:49.680539389 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-09-17 10:25:41.439419649 +0100
|
||||
***************
|
||||
*** 63,69 ****
|
||||
|
||||
invoke-static {v1, p1}, Lc0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://support.discord.com"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
--- 63,69 ----
|
||||
|
||||
invoke-static {v1, p1}, Lc0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://gitdab.com/distok/cutthecord"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
|
|
@ -0,0 +1,247 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-09-23 12:14:36.178684469 +0100
|
||||
--- to/AndroidManifest.xml 2020-09-23 12:18:46.290536105 +0100
|
||||
***************
|
||||
*** 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="1279" platformBuildVersionName="41.10">
|
||||
<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="1279CTCBUILD" platformBuildVersionName="41.10-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"/>
|
||||
***************
|
||||
*** 21,33 ****
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <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">
|
||||
--- 21,33 ----
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <application android:allowBackup="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: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">
|
||||
***************
|
||||
*** 131,137 ****
|
||||
<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"/>
|
||||
--- 131,137 ----
|
||||
<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.CTCBRANCH.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 155,161 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:foregroundServiceType="mediaProjection" 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"/>
|
||||
--- 155,161 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:foregroundServiceType="mediaProjection" 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"/>
|
||||
***************
|
||||
*** 177,183 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonKtxRegistrar" 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"/>
|
||||
--- 177,183 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonKtxRegistrar" 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"/>
|
||||
***************
|
||||
*** 195,208 ****
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
--- 195,208 ----
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
***************
|
||||
*** 257,260 ****
|
||||
<activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize" android:name="com.android.billingclient.api.ProxyBillingActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 257,260 ----
|
||||
<activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize" android:name="com.android.billingclient.api.ProxyBillingActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
<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-09-23 12:13:33.414701330 +0100
|
||||
--- to/apktool.yml 2020-09-23 12:18:46.290536105 +0100
|
||||
***************
|
||||
*** 3111,3115 ****
|
||||
tag: null
|
||||
version: 2.4.2-f3136b-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1279'
|
||||
! versionName: '41.10'
|
||||
--- 3111,3115 ----
|
||||
tag: null
|
||||
version: 2.4.2-f3136b-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1279CTCBUILD'
|
||||
! versionName: '41.10-cutthecord-CTCBUILD'
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-09-23 12:13:29.486702054 +0100
|
||||
--- to/res/values/strings.xml 2020-09-23 12:18:46.292536104 +0100
|
||||
***************
|
||||
*** 1512,1518 ****
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1512,1518 ----
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 4312,4318 ****
|
||||
<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_muted">Notifications, muted</string>
|
||||
--- 4312,4318 ----
|
||||
<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_muted">Notifications, muted</string>
|
||||
***************
|
||||
*** 5732,5738 ****
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</string>
|
||||
--- 5732,5738 ----
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</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-09-23 12:13:31.076701766 +0100
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-09-23 12:18:46.292536104 +0100
|
||||
***************
|
||||
*** 78,84 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discord.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 78,84 ----
|
||||
.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;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-09-23 12:13:31.890701616 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-09-23 12:19:59.964473271 +0100
|
||||
***************
|
||||
*** 63,69 ****
|
||||
|
||||
invoke-static {v1, p1}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://support.discord.com"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
--- 63,69 ----
|
||||
|
||||
invoke-static {v1, p1}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://gitdab.com/distok/cutthecord"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
|
|
@ -0,0 +1,247 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-09-24 10:54:44.658839333 +0100
|
||||
--- to/AndroidManifest.xml 2020-09-24 10:55:42.436431308 +0100
|
||||
***************
|
||||
*** 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="1280" platformBuildVersionName="41.11">
|
||||
<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="1280CTCBUILD" platformBuildVersionName="41.11-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"/>
|
||||
***************
|
||||
*** 21,33 ****
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <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">
|
||||
--- 21,33 ----
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <application android:allowBackup="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: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">
|
||||
***************
|
||||
*** 131,137 ****
|
||||
<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"/>
|
||||
--- 131,137 ----
|
||||
<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.CTCBRANCH.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 155,161 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:foregroundServiceType="mediaProjection" 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"/>
|
||||
--- 155,161 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:foregroundServiceType="mediaProjection" 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"/>
|
||||
***************
|
||||
*** 177,183 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonKtxRegistrar" 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"/>
|
||||
--- 177,183 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonKtxRegistrar" 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"/>
|
||||
***************
|
||||
*** 195,208 ****
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
--- 195,208 ----
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
***************
|
||||
*** 257,260 ****
|
||||
<activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize" android:name="com.android.billingclient.api.ProxyBillingActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 257,260 ----
|
||||
<activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize" android:name="com.android.billingclient.api.ProxyBillingActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
<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-09-24 10:54:04.827280707 +0100
|
||||
--- to/apktool.yml 2020-09-24 10:55:42.436431308 +0100
|
||||
***************
|
||||
*** 3111,3115 ****
|
||||
tag: null
|
||||
version: 2.4.2-f3136b-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1280'
|
||||
! versionName: '41.11'
|
||||
--- 3111,3115 ----
|
||||
tag: null
|
||||
version: 2.4.2-f3136b-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1280CTCBUILD'
|
||||
! versionName: '41.11-cutthecord-CTCBUILD'
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-09-24 10:54:01.309244933 +0100
|
||||
--- to/res/values/strings.xml 2020-09-24 10:55:42.436431308 +0100
|
||||
***************
|
||||
*** 1512,1518 ****
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1512,1518 ----
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 4312,4318 ****
|
||||
<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_muted">Notifications, muted</string>
|
||||
--- 4312,4318 ----
|
||||
<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_muted">Notifications, muted</string>
|
||||
***************
|
||||
*** 5732,5738 ****
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</string>
|
||||
--- 5732,5738 ----
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</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-09-24 10:54:02.873261869 +0100
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-09-24 10:55:42.436431308 +0100
|
||||
***************
|
||||
*** 78,84 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discord.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 78,84 ----
|
||||
.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;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-09-24 10:54:03.563268756 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-09-24 10:55:42.436431308 +0100
|
||||
***************
|
||||
*** 63,69 ****
|
||||
|
||||
invoke-static {v1, p1}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://support.discord.com"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
--- 63,69 ----
|
||||
|
||||
invoke-static {v1, p1}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://gitdab.com/distok/cutthecord"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
|
|
@ -0,0 +1,247 @@
|
|||
diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
|
||||
*** from/AndroidManifest.xml 2020-09-29 13:36:06.215293796 +0100
|
||||
--- to/AndroidManifest.xml 2020-09-29 13:41:51.922947388 +0100
|
||||
***************
|
||||
*** 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="1281" platformBuildVersionName="42.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="1281CTCBUILD" platformBuildVersionName="42.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"/>
|
||||
***************
|
||||
*** 21,33 ****
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <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">
|
||||
--- 21,33 ----
|
||||
<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-feature android:name="android.hardware.camera.any" android:required="false"/>
|
||||
<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-feature android:name="android.hardware.camera.front" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
! <application android:allowBackup="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: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">
|
||||
***************
|
||||
*** 131,137 ****
|
||||
<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"/>
|
||||
--- 131,137 ----
|
||||
<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.CTCBRANCH.permission.CONNECT">
|
||||
<intent-filter>
|
||||
<action android:name="com.discord.intent.action.CONNECT"/>
|
||||
<data android:host="app" android:pathPattern="/connect/.*" android:scheme="discord"/>
|
||||
***************
|
||||
*** 155,161 ****
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:foregroundServiceType="mediaProjection" 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"/>
|
||||
--- 155,161 ----
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service android:foregroundServiceType="mediaProjection" 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"/>
|
||||
***************
|
||||
*** 178,184 ****
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonKtxRegistrar" 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"/>
|
||||
--- 178,184 ----
|
||||
<meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonKtxRegistrar" 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"/>
|
||||
***************
|
||||
*** 196,209 ****
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.discord.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
--- 196,209 ----
|
||||
<receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
|
||||
<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"/>
|
||||
! <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
|
||||
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
|
||||
<service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
|
||||
<intent-filter>
|
||||
<action android:name="android.service.chooser.ChooserTargetService"/>
|
||||
</intent-filter>
|
||||
</service>
|
||||
! <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"/>
|
||||
<service android:directBootAware="false" android:enabled="@bool/enable_system_foreground_service_default" android:exported="false" android:name="androidx.work.impl.foreground.SystemForegroundService"/>
|
||||
***************
|
||||
*** 258,261 ****
|
||||
<activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize" android:name="com.android.billingclient.api.ProxyBillingActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
<meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
|
||||
</application>
|
||||
! </manifest>
|
||||
\ No newline at end of file
|
||||
--- 258,261 ----
|
||||
<activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize" android:name="com.android.billingclient.api.ProxyBillingActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
|
||||
<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-09-29 13:35:48.475289304 +0100
|
||||
--- to/apktool.yml 2020-09-29 13:41:51.922947388 +0100
|
||||
***************
|
||||
*** 78,82 ****
|
||||
tag: null
|
||||
version: 2.4.2-f3136b-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1281'
|
||||
! versionName: '42.0'
|
||||
--- 78,82 ----
|
||||
tag: null
|
||||
version: 2.4.2-f3136b-SNAPSHOT
|
||||
versionInfo:
|
||||
! versionCode: '1281CTCBUILD'
|
||||
! versionName: '42.0-cutthecord-CTCBUILD'
|
||||
diff -crB from/res/values/strings.xml to/res/values/strings.xml
|
||||
*** from/res/values/strings.xml 2020-09-29 13:35:43.254599726 +0100
|
||||
--- to/res/values/strings.xml 2020-09-29 13:41:51.922947388 +0100
|
||||
***************
|
||||
*** 1542,1548 ****
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">Discord</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
--- 1542,1548 ----
|
||||
<string name="disconnect_account_title">Disconnect %1$s</string>
|
||||
<string name="disconnect_from_voice">Disconnect from Voice</string>
|
||||
<string name="disconnect_user_success">User has been disconnected from voice.</string>
|
||||
! <string name="discord">CTCNAME</string>
|
||||
<string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
|
||||
<string name="discord_desc_short">Your place to talk</string>
|
||||
<string name="discord_gg">discord.gg/</string>
|
||||
***************
|
||||
*** 4356,4362 ****
|
||||
<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_muted">Notifications, muted</string>
|
||||
--- 4356,4362 ----
|
||||
<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_muted">Notifications, muted</string>
|
||||
***************
|
||||
*** 5802,5808 ****
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</string>
|
||||
--- 5802,5808 ----
|
||||
<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_embed_body">This will remove all embeds on this message for everyone.</string>
|
||||
<string name="suppress_embed_confirm">Remove All Embeds</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-09-29 13:35:45.302876938 +0100
|
||||
--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-09-29 13:41:51.924947357 +0100
|
||||
***************
|
||||
*** 78,84 ****
|
||||
.line 3
|
||||
new-instance v0, Landroid/content/Intent;
|
||||
|
||||
! const-string v1, "https://discord.com/app"
|
||||
|
||||
.line 4
|
||||
invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
|
||||
--- 78,84 ----
|
||||
.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;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-09-29 13:35:46.367017476 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-09-29 13:41:51.924947357 +0100
|
||||
***************
|
||||
*** 63,69 ****
|
||||
|
||||
invoke-static {v1, p1}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://support.discord.com"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
--- 63,69 ----
|
||||
|
||||
invoke-static {v1, p1}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! const-string v2, "https://gitdab.com/distok/cutthecord"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
|
|
@ -192,4 +192,14 @@ You can use the following line to patch authorities:
|
|||
- 34.3
|
||||
- 35.0-alpha1
|
||||
- 36.3
|
||||
- 36.5
|
||||
- 38.0
|
||||
- 38.1
|
||||
- 40.04
|
||||
- 41.02
|
||||
- 41.05
|
||||
- 41.06
|
||||
- 41.10
|
||||
- 41.11
|
||||
- 42.0
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,344 @@
|
|||
diff -crB from/res/drawable/drawable_bg_corners_20dp.xml to/res/drawable/drawable_bg_corners_20dp.xml
|
||||
*** from/res/drawable/drawable_bg_corners_20dp.xml 2020-08-20 11:50:14.660000000 +0300
|
||||
--- to/res/drawable/drawable_bg_corners_20dp.xml 2020-08-20 11:53:34.390000000 +0300
|
||||
***************
|
||||
*** 1,6 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/white" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,6 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
diff -crB from/res/drawable/drawable_circle_black.xml to/res/drawable/drawable_circle_black.xml
|
||||
*** from/res/drawable/drawable_circle_black.xml 2020-08-20 11:50:14.110000000 +0300
|
||||
--- to/res/drawable/drawable_circle_black.xml 2020-08-20 11:53:34.390000000 +0300
|
||||
***************
|
||||
*** 1,5 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/black" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,5 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
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-08-20 11:50:14.340000000 +0300
|
||||
--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-08-20 11:53:34.390000000 +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 from/res/values/colors.xml to/res/values/colors.xml
|
||||
*** from/res/values/colors.xml 2020-08-20 11:50:16.030000000 +0300
|
||||
--- to/res/values/colors.xml 2020-08-20 11:53:34.390000000 +0300
|
||||
***************
|
||||
*** 105,114 ****
|
||||
<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>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
--- 105,114 ----
|
||||
<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">#ff000000</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
***************
|
||||
*** 120,126 ****
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff121212</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
--- 120,126 ----
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff000000</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
***************
|
||||
*** 167,174 ****
|
||||
<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>
|
||||
--- 167,174 ----
|
||||
<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>
|
||||
***************
|
||||
*** 178,184 ****
|
||||
<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>
|
||||
--- 178,184 ----
|
||||
<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>
|
||||
***************
|
||||
*** 291,310 ****
|
||||
<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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
--- 291,310 ----
|
||||
<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">#ff000000</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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
***************
|
||||
*** 329,338 ****
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff36393f</color>
|
||||
! <color name="primary_dark_630">#ff2f3136</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff202225</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
--- 329,338 ----
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff000000</color>
|
||||
! <color name="primary_dark_630">#ff000000</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff000000</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
***************
|
||||
*** 378,386 ****
|
||||
<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>
|
||||
--- 378,386 ----
|
||||
<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>
|
||||
***************
|
||||
*** 519,525 ****
|
||||
<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>
|
||||
--- 519,525 ----
|
||||
<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-08-20 11:50:15.940000000 +0300
|
||||
--- to/res/values/styles.xml 2020-08-20 11:53:34.400000000 +0300
|
||||
***************
|
||||
*** 387,393 ****
|
||||
<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>
|
||||
--- 387,393 ----
|
||||
<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>
|
||||
***************
|
||||
*** 398,410 ****
|
||||
<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_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_placeholder">@drawable/ic_emoji_placeholder_primary_500</item>
|
||||
--- 398,410 ----
|
||||
<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_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_placeholder">@drawable/ic_emoji_placeholder_primary_500</item>
|
||||
***************
|
||||
*** 739,745 ****
|
||||
<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>
|
||||
--- 739,745 ----
|
||||
<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>
|
||||
***************
|
||||
*** 768,774 ****
|
||||
<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>
|
||||
--- 768,774 ----
|
||||
<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_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-08-20 11:50:18.770000000 +0300
|
||||
--- to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-08-20 11:53:34.400000000 +0300
|
||||
***************
|
||||
*** 78,84 ****
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f06026e
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
--- 78,84 ----
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f060024
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
|
|
@ -0,0 +1,344 @@
|
|||
diff -crB from/res/drawable/drawable_bg_corners_20dp.xml to/res/drawable/drawable_bg_corners_20dp.xml
|
||||
*** from/res/drawable/drawable_bg_corners_20dp.xml 2020-08-20 11:50:14.660000000 +0300
|
||||
--- to/res/drawable/drawable_bg_corners_20dp.xml 2020-08-20 11:53:34.390000000 +0300
|
||||
***************
|
||||
*** 1,6 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/white" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,6 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
diff -crB from/res/drawable/drawable_circle_black.xml to/res/drawable/drawable_circle_black.xml
|
||||
*** from/res/drawable/drawable_circle_black.xml 2020-08-20 11:50:14.110000000 +0300
|
||||
--- to/res/drawable/drawable_circle_black.xml 2020-08-20 11:53:34.390000000 +0300
|
||||
***************
|
||||
*** 1,5 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/black" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,5 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
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-08-20 11:50:14.340000000 +0300
|
||||
--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-08-20 11:53:34.390000000 +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 from/res/values/colors.xml to/res/values/colors.xml
|
||||
*** from/res/values/colors.xml 2020-08-20 11:50:16.030000000 +0300
|
||||
--- to/res/values/colors.xml 2020-08-20 11:53:34.390000000 +0300
|
||||
***************
|
||||
*** 105,114 ****
|
||||
<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>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
--- 105,114 ----
|
||||
<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">#ff000000</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
***************
|
||||
*** 120,126 ****
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff121212</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
--- 120,126 ----
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff000000</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
***************
|
||||
*** 167,174 ****
|
||||
<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>
|
||||
--- 167,174 ----
|
||||
<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>
|
||||
***************
|
||||
*** 178,184 ****
|
||||
<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>
|
||||
--- 178,184 ----
|
||||
<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>
|
||||
***************
|
||||
*** 291,310 ****
|
||||
<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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
--- 291,310 ----
|
||||
<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">#ff000000</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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
***************
|
||||
*** 329,338 ****
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff36393f</color>
|
||||
! <color name="primary_dark_630">#ff2f3136</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff202225</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
--- 329,338 ----
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff000000</color>
|
||||
! <color name="primary_dark_630">#ff000000</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff000000</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
***************
|
||||
*** 378,386 ****
|
||||
<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>
|
||||
--- 378,386 ----
|
||||
<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>
|
||||
***************
|
||||
*** 519,525 ****
|
||||
<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>
|
||||
--- 519,525 ----
|
||||
<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-08-20 11:50:15.940000000 +0300
|
||||
--- to/res/values/styles.xml 2020-08-20 11:53:34.400000000 +0300
|
||||
***************
|
||||
*** 387,393 ****
|
||||
<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>
|
||||
--- 387,393 ----
|
||||
<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>
|
||||
***************
|
||||
*** 398,410 ****
|
||||
<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_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_placeholder">@drawable/ic_emoji_placeholder_primary_500</item>
|
||||
--- 398,410 ----
|
||||
<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_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_placeholder">@drawable/ic_emoji_placeholder_primary_500</item>
|
||||
***************
|
||||
*** 739,745 ****
|
||||
<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>
|
||||
--- 739,745 ----
|
||||
<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>
|
||||
***************
|
||||
*** 768,774 ****
|
||||
<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>
|
||||
--- 768,774 ----
|
||||
<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_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-08-20 11:50:18.770000000 +0300
|
||||
--- to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-08-20 11:53:34.400000000 +0300
|
||||
***************
|
||||
*** 78,84 ****
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f06026e
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
--- 78,84 ----
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f060024
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
|
|
@ -0,0 +1,344 @@
|
|||
diff -crB from/res/drawable/drawable_bg_corners_20dp.xml to/res/drawable/drawable_bg_corners_20dp.xml
|
||||
*** from/res/drawable/drawable_bg_corners_20dp.xml 2020-08-20 11:50:14.660000000 +0300
|
||||
--- to/res/drawable/drawable_bg_corners_20dp.xml 2020-08-20 11:53:34.390000000 +0300
|
||||
***************
|
||||
*** 1,6 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/white" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,6 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
diff -crB from/res/drawable/drawable_circle_black.xml to/res/drawable/drawable_circle_black.xml
|
||||
*** from/res/drawable/drawable_circle_black.xml 2020-08-20 11:50:14.110000000 +0300
|
||||
--- to/res/drawable/drawable_circle_black.xml 2020-08-20 11:53:34.390000000 +0300
|
||||
***************
|
||||
*** 1,5 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/black" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,5 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
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-08-20 11:50:14.340000000 +0300
|
||||
--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-08-20 11:53:34.390000000 +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 from/res/values/colors.xml to/res/values/colors.xml
|
||||
*** from/res/values/colors.xml 2020-08-20 11:50:16.030000000 +0300
|
||||
--- to/res/values/colors.xml 2020-08-20 11:53:34.390000000 +0300
|
||||
***************
|
||||
*** 105,114 ****
|
||||
<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>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
--- 105,114 ----
|
||||
<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">#ff000000</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
***************
|
||||
*** 120,126 ****
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff121212</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
--- 120,126 ----
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff000000</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
***************
|
||||
*** 167,174 ****
|
||||
<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>
|
||||
--- 167,174 ----
|
||||
<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>
|
||||
***************
|
||||
*** 178,184 ****
|
||||
<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>
|
||||
--- 178,184 ----
|
||||
<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>
|
||||
***************
|
||||
*** 291,310 ****
|
||||
<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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
--- 291,310 ----
|
||||
<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">#ff000000</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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
***************
|
||||
*** 329,338 ****
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff36393f</color>
|
||||
! <color name="primary_dark_630">#ff2f3136</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff202225</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
--- 329,338 ----
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff000000</color>
|
||||
! <color name="primary_dark_630">#ff000000</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff000000</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
***************
|
||||
*** 378,386 ****
|
||||
<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>
|
||||
--- 378,386 ----
|
||||
<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>
|
||||
***************
|
||||
*** 519,525 ****
|
||||
<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>
|
||||
--- 519,525 ----
|
||||
<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-08-20 11:50:15.940000000 +0300
|
||||
--- to/res/values/styles.xml 2020-08-20 11:53:34.400000000 +0300
|
||||
***************
|
||||
*** 387,393 ****
|
||||
<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>
|
||||
--- 387,393 ----
|
||||
<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>
|
||||
***************
|
||||
*** 398,410 ****
|
||||
<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_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_placeholder">@drawable/ic_emoji_placeholder_primary_500</item>
|
||||
--- 398,410 ----
|
||||
<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_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_placeholder">@drawable/ic_emoji_placeholder_primary_500</item>
|
||||
***************
|
||||
*** 739,745 ****
|
||||
<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>
|
||||
--- 739,745 ----
|
||||
<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>
|
||||
***************
|
||||
*** 768,774 ****
|
||||
<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>
|
||||
--- 768,774 ----
|
||||
<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_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-08-20 11:50:18.770000000 +0300
|
||||
--- to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-08-20 11:53:34.400000000 +0300
|
||||
***************
|
||||
*** 78,84 ****
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f06026e
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
--- 78,84 ----
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f060024
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
|
|
@ -0,0 +1,344 @@
|
|||
diff -crB from/res/drawable/drawable_bg_corners_20dp.xml to/res/drawable/drawable_bg_corners_20dp.xml
|
||||
*** from/res/drawable/drawable_bg_corners_20dp.xml 2020-08-20 11:50:14.660000000 +0300
|
||||
--- to/res/drawable/drawable_bg_corners_20dp.xml 2020-08-20 11:53:34.390000000 +0300
|
||||
***************
|
||||
*** 1,6 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/white" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,6 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
diff -crB from/res/drawable/drawable_circle_black.xml to/res/drawable/drawable_circle_black.xml
|
||||
*** from/res/drawable/drawable_circle_black.xml 2020-08-20 11:50:14.110000000 +0300
|
||||
--- to/res/drawable/drawable_circle_black.xml 2020-08-20 11:53:34.390000000 +0300
|
||||
***************
|
||||
*** 1,5 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/black" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,5 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
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-08-20 11:50:14.340000000 +0300
|
||||
--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-08-20 11:53:34.390000000 +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 from/res/values/colors.xml to/res/values/colors.xml
|
||||
*** from/res/values/colors.xml 2020-08-20 11:50:16.030000000 +0300
|
||||
--- to/res/values/colors.xml 2020-08-20 11:53:34.390000000 +0300
|
||||
***************
|
||||
*** 105,114 ****
|
||||
<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>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
--- 105,114 ----
|
||||
<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">#ff000000</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
***************
|
||||
*** 120,126 ****
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff121212</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
--- 120,126 ----
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff000000</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
***************
|
||||
*** 167,174 ****
|
||||
<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>
|
||||
--- 167,174 ----
|
||||
<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>
|
||||
***************
|
||||
*** 178,184 ****
|
||||
<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>
|
||||
--- 178,184 ----
|
||||
<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>
|
||||
***************
|
||||
*** 291,310 ****
|
||||
<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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
--- 291,310 ----
|
||||
<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">#ff000000</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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
***************
|
||||
*** 329,338 ****
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff36393f</color>
|
||||
! <color name="primary_dark_630">#ff2f3136</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff202225</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
--- 329,338 ----
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff000000</color>
|
||||
! <color name="primary_dark_630">#ff000000</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff000000</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
***************
|
||||
*** 378,386 ****
|
||||
<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>
|
||||
--- 378,386 ----
|
||||
<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>
|
||||
***************
|
||||
*** 519,525 ****
|
||||
<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>
|
||||
--- 519,525 ----
|
||||
<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-08-20 11:50:15.940000000 +0300
|
||||
--- to/res/values/styles.xml 2020-08-20 11:53:34.400000000 +0300
|
||||
***************
|
||||
*** 387,393 ****
|
||||
<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>
|
||||
--- 387,393 ----
|
||||
<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>
|
||||
***************
|
||||
*** 398,410 ****
|
||||
<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_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_placeholder">@drawable/ic_emoji_placeholder_primary_500</item>
|
||||
--- 398,410 ----
|
||||
<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_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_placeholder">@drawable/ic_emoji_placeholder_primary_500</item>
|
||||
***************
|
||||
*** 739,745 ****
|
||||
<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>
|
||||
--- 739,745 ----
|
||||
<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>
|
||||
***************
|
||||
*** 768,774 ****
|
||||
<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>
|
||||
--- 768,774 ----
|
||||
<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_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-08-20 11:50:18.770000000 +0300
|
||||
--- to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-08-20 11:53:34.400000000 +0300
|
||||
***************
|
||||
*** 78,84 ****
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f06026e
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
--- 78,84 ----
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f060024
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
|
|
@ -0,0 +1,344 @@
|
|||
diff -crB from/res/drawable/drawable_bg_corners_20dp.xml to/res/drawable/drawable_bg_corners_20dp.xml
|
||||
*** from/res/drawable/drawable_bg_corners_20dp.xml 2020-09-13 11:49:32.209081172 +0100
|
||||
--- to/res/drawable/drawable_bg_corners_20dp.xml 2020-09-13 11:55:32.754265939 +0100
|
||||
***************
|
||||
*** 1,6 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/white" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,6 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
diff -crB from/res/drawable/drawable_circle_black.xml to/res/drawable/drawable_circle_black.xml
|
||||
*** from/res/drawable/drawable_circle_black.xml 2020-09-13 11:49:32.175079796 +0100
|
||||
--- to/res/drawable/drawable_circle_black.xml 2020-09-13 11:55:32.754265939 +0100
|
||||
***************
|
||||
*** 1,5 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/black" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,5 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
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-09-13 11:49:31.213040486 +0100
|
||||
--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-09-13 11:55:32.754265939 +0100
|
||||
***************
|
||||
*** 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-09-13 11:49:32.505093150 +0100
|
||||
--- to/res/values/colors.xml 2020-09-13 11:55:32.754265939 +0100
|
||||
***************
|
||||
*** 106,115 ****
|
||||
<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>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
--- 106,115 ----
|
||||
<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">#ff000000</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
***************
|
||||
*** 121,127 ****
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff121212</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
--- 121,127 ----
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff000000</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
***************
|
||||
*** 170,177 ****
|
||||
<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>
|
||||
--- 170,177 ----
|
||||
<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>
|
||||
***************
|
||||
*** 181,187 ****
|
||||
<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>
|
||||
--- 181,187 ----
|
||||
<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>
|
||||
***************
|
||||
*** 294,313 ****
|
||||
<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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
--- 294,313 ----
|
||||
<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">#ff000000</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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
***************
|
||||
*** 332,341 ****
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff36393f</color>
|
||||
! <color name="primary_dark_630">#ff2f3136</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff202225</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
--- 332,341 ----
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff000000</color>
|
||||
! <color name="primary_dark_630">#ff000000</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff000000</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
***************
|
||||
*** 381,389 ****
|
||||
<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>
|
||||
--- 381,389 ----
|
||||
<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>
|
||||
***************
|
||||
*** 522,528 ****
|
||||
<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>
|
||||
--- 522,528 ----
|
||||
<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-09-13 11:49:32.783104402 +0100
|
||||
--- to/res/values/styles.xml 2020-09-13 11:55:32.756266124 +0100
|
||||
***************
|
||||
*** 390,396 ****
|
||||
<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>
|
||||
--- 390,396 ----
|
||||
<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,413 ****
|
||||
<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_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_settings_empty">@drawable/img_empty_server_settings_emoji_dark</item>
|
||||
--- 401,413 ----
|
||||
<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_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_settings_empty">@drawable/img_empty_server_settings_emoji_dark</item>
|
||||
***************
|
||||
*** 745,751 ****
|
||||
<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="bg_mentions">@drawable/drawable_overlay_mentions_primary_800</item>
|
||||
--- 745,751 ----
|
||||
<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="bg_mentions">@drawable/drawable_overlay_mentions_primary_800</item>
|
||||
***************
|
||||
*** 775,781 ****
|
||||
<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>
|
||||
--- 775,781 ----
|
||||
<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_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-09-13 11:49:34.963191347 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-09-13 11:55:55.546422055 +0100
|
||||
***************
|
||||
*** 82,88 ****
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f060275
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
--- 82,88 ----
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f060024
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
|
|
@ -0,0 +1,344 @@
|
|||
diff -crB from/res/drawable/drawable_bg_corners_20dp.xml to/res/drawable/drawable_bg_corners_20dp.xml
|
||||
*** from/res/drawable/drawable_bg_corners_20dp.xml 2020-09-13 11:49:32.209081172 +0100
|
||||
--- to/res/drawable/drawable_bg_corners_20dp.xml 2020-09-13 11:55:32.754265939 +0100
|
||||
***************
|
||||
*** 1,6 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/white" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,6 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
diff -crB from/res/drawable/drawable_circle_black.xml to/res/drawable/drawable_circle_black.xml
|
||||
*** from/res/drawable/drawable_circle_black.xml 2020-09-13 11:49:32.175079796 +0100
|
||||
--- to/res/drawable/drawable_circle_black.xml 2020-09-13 11:55:32.754265939 +0100
|
||||
***************
|
||||
*** 1,5 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/black" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,5 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
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-09-13 11:49:31.213040486 +0100
|
||||
--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-09-13 11:55:32.754265939 +0100
|
||||
***************
|
||||
*** 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-09-13 11:49:32.505093150 +0100
|
||||
--- to/res/values/colors.xml 2020-09-13 11:55:32.754265939 +0100
|
||||
***************
|
||||
*** 106,115 ****
|
||||
<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>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
--- 106,115 ----
|
||||
<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">#ff000000</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
***************
|
||||
*** 121,127 ****
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff121212</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
--- 121,127 ----
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff000000</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
***************
|
||||
*** 170,177 ****
|
||||
<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>
|
||||
--- 170,177 ----
|
||||
<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>
|
||||
***************
|
||||
*** 181,187 ****
|
||||
<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>
|
||||
--- 181,187 ----
|
||||
<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>
|
||||
***************
|
||||
*** 294,313 ****
|
||||
<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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
--- 294,313 ----
|
||||
<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">#ff000000</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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
***************
|
||||
*** 332,341 ****
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff36393f</color>
|
||||
! <color name="primary_dark_630">#ff2f3136</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff202225</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
--- 332,341 ----
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff000000</color>
|
||||
! <color name="primary_dark_630">#ff000000</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff000000</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
***************
|
||||
*** 381,389 ****
|
||||
<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>
|
||||
--- 381,389 ----
|
||||
<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>
|
||||
***************
|
||||
*** 522,528 ****
|
||||
<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>
|
||||
--- 522,528 ----
|
||||
<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-09-13 11:49:32.783104402 +0100
|
||||
--- to/res/values/styles.xml 2020-09-13 11:55:32.756266124 +0100
|
||||
***************
|
||||
*** 390,396 ****
|
||||
<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>
|
||||
--- 390,396 ----
|
||||
<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,413 ****
|
||||
<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_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_settings_empty">@drawable/img_empty_server_settings_emoji_dark</item>
|
||||
--- 401,413 ----
|
||||
<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_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_settings_empty">@drawable/img_empty_server_settings_emoji_dark</item>
|
||||
***************
|
||||
*** 745,751 ****
|
||||
<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="bg_mentions">@drawable/drawable_overlay_mentions_primary_800</item>
|
||||
--- 745,751 ----
|
||||
<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="bg_mentions">@drawable/drawable_overlay_mentions_primary_800</item>
|
||||
***************
|
||||
*** 775,781 ****
|
||||
<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>
|
||||
--- 775,781 ----
|
||||
<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_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-09-13 11:49:34.963191347 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-09-13 11:55:55.546422055 +0100
|
||||
***************
|
||||
*** 82,88 ****
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f060275
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
--- 82,88 ----
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f060024
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
|
|
@ -0,0 +1,344 @@
|
|||
diff -crB from/res/drawable/drawable_bg_corners_20dp.xml to/res/drawable/drawable_bg_corners_20dp.xml
|
||||
*** from/res/drawable/drawable_bg_corners_20dp.xml 2020-09-13 11:49:32.209081172 +0100
|
||||
--- to/res/drawable/drawable_bg_corners_20dp.xml 2020-09-13 11:55:32.754265939 +0100
|
||||
***************
|
||||
*** 1,6 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/white" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,6 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
diff -crB from/res/drawable/drawable_circle_black.xml to/res/drawable/drawable_circle_black.xml
|
||||
*** from/res/drawable/drawable_circle_black.xml 2020-09-13 11:49:32.175079796 +0100
|
||||
--- to/res/drawable/drawable_circle_black.xml 2020-09-13 11:55:32.754265939 +0100
|
||||
***************
|
||||
*** 1,5 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/black" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,5 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
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-09-13 11:49:31.213040486 +0100
|
||||
--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-09-13 11:55:32.754265939 +0100
|
||||
***************
|
||||
*** 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-09-13 11:49:32.505093150 +0100
|
||||
--- to/res/values/colors.xml 2020-09-13 11:55:32.754265939 +0100
|
||||
***************
|
||||
*** 106,115 ****
|
||||
<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>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
--- 106,115 ----
|
||||
<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">#ff000000</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
***************
|
||||
*** 121,127 ****
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff121212</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
--- 121,127 ----
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff000000</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
***************
|
||||
*** 170,177 ****
|
||||
<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>
|
||||
--- 170,177 ----
|
||||
<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>
|
||||
***************
|
||||
*** 181,187 ****
|
||||
<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>
|
||||
--- 181,187 ----
|
||||
<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>
|
||||
***************
|
||||
*** 294,313 ****
|
||||
<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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
--- 294,313 ----
|
||||
<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">#ff000000</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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
***************
|
||||
*** 332,341 ****
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff36393f</color>
|
||||
! <color name="primary_dark_630">#ff2f3136</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff202225</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
--- 332,341 ----
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff000000</color>
|
||||
! <color name="primary_dark_630">#ff000000</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff000000</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
***************
|
||||
*** 381,389 ****
|
||||
<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>
|
||||
--- 381,389 ----
|
||||
<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>
|
||||
***************
|
||||
*** 522,528 ****
|
||||
<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>
|
||||
--- 522,528 ----
|
||||
<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-09-13 11:49:32.783104402 +0100
|
||||
--- to/res/values/styles.xml 2020-09-13 11:55:32.756266124 +0100
|
||||
***************
|
||||
*** 390,396 ****
|
||||
<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>
|
||||
--- 390,396 ----
|
||||
<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,413 ****
|
||||
<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_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_settings_empty">@drawable/img_empty_server_settings_emoji_dark</item>
|
||||
--- 401,413 ----
|
||||
<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_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_settings_empty">@drawable/img_empty_server_settings_emoji_dark</item>
|
||||
***************
|
||||
*** 745,751 ****
|
||||
<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="bg_mentions">@drawable/drawable_overlay_mentions_primary_800</item>
|
||||
--- 745,751 ----
|
||||
<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="bg_mentions">@drawable/drawable_overlay_mentions_primary_800</item>
|
||||
***************
|
||||
*** 775,781 ****
|
||||
<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>
|
||||
--- 775,781 ----
|
||||
<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_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-09-13 11:49:34.963191347 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-09-13 11:55:55.546422055 +0100
|
||||
***************
|
||||
*** 82,88 ****
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f060275
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
--- 82,88 ----
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f060024
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
|
|
@ -0,0 +1,344 @@
|
|||
diff -crB from/res/drawable/drawable_bg_corners_20dp.xml to/res/drawable/drawable_bg_corners_20dp.xml
|
||||
*** from/res/drawable/drawable_bg_corners_20dp.xml 2020-09-13 11:49:32.209081172 +0100
|
||||
--- to/res/drawable/drawable_bg_corners_20dp.xml 2020-09-13 11:55:32.754265939 +0100
|
||||
***************
|
||||
*** 1,6 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/white" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,6 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
diff -crB from/res/drawable/drawable_circle_black.xml to/res/drawable/drawable_circle_black.xml
|
||||
*** from/res/drawable/drawable_circle_black.xml 2020-09-13 11:49:32.175079796 +0100
|
||||
--- to/res/drawable/drawable_circle_black.xml 2020-09-13 11:55:32.754265939 +0100
|
||||
***************
|
||||
*** 1,5 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/black" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,5 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
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-09-13 11:49:31.213040486 +0100
|
||||
--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-09-13 11:55:32.754265939 +0100
|
||||
***************
|
||||
*** 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-09-13 11:49:32.505093150 +0100
|
||||
--- to/res/values/colors.xml 2020-09-13 11:55:32.754265939 +0100
|
||||
***************
|
||||
*** 106,115 ****
|
||||
<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>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
--- 106,115 ----
|
||||
<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">#ff000000</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
***************
|
||||
*** 121,127 ****
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff121212</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
--- 121,127 ----
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff000000</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
***************
|
||||
*** 170,177 ****
|
||||
<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>
|
||||
--- 170,177 ----
|
||||
<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>
|
||||
***************
|
||||
*** 181,187 ****
|
||||
<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>
|
||||
--- 181,187 ----
|
||||
<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>
|
||||
***************
|
||||
*** 294,313 ****
|
||||
<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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
--- 294,313 ----
|
||||
<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">#ff000000</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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
***************
|
||||
*** 332,341 ****
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff36393f</color>
|
||||
! <color name="primary_dark_630">#ff2f3136</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff202225</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
--- 332,341 ----
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff000000</color>
|
||||
! <color name="primary_dark_630">#ff000000</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff000000</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
***************
|
||||
*** 381,389 ****
|
||||
<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>
|
||||
--- 381,389 ----
|
||||
<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>
|
||||
***************
|
||||
*** 522,528 ****
|
||||
<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>
|
||||
--- 522,528 ----
|
||||
<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-09-13 11:49:32.783104402 +0100
|
||||
--- to/res/values/styles.xml 2020-09-13 11:55:32.756266124 +0100
|
||||
***************
|
||||
*** 390,396 ****
|
||||
<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>
|
||||
--- 390,396 ----
|
||||
<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,413 ****
|
||||
<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_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_settings_empty">@drawable/img_empty_server_settings_emoji_dark</item>
|
||||
--- 401,413 ----
|
||||
<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_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_settings_empty">@drawable/img_empty_server_settings_emoji_dark</item>
|
||||
***************
|
||||
*** 745,751 ****
|
||||
<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="bg_mentions">@drawable/drawable_overlay_mentions_primary_800</item>
|
||||
--- 745,751 ----
|
||||
<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="bg_mentions">@drawable/drawable_overlay_mentions_primary_800</item>
|
||||
***************
|
||||
*** 775,781 ****
|
||||
<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>
|
||||
--- 775,781 ----
|
||||
<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_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-09-13 11:49:34.963191347 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-09-13 11:55:55.546422055 +0100
|
||||
***************
|
||||
*** 82,88 ****
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f060275
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
--- 82,88 ----
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f060024
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
|
|
@ -0,0 +1,344 @@
|
|||
diff -crB from/res/drawable/drawable_bg_corners_20dp.xml to/res/drawable/drawable_bg_corners_20dp.xml
|
||||
*** from/res/drawable/drawable_bg_corners_20dp.xml 2020-09-23 12:13:27.638702380 +0100
|
||||
--- to/res/drawable/drawable_bg_corners_20dp.xml 2020-09-23 12:14:29.664686667 +0100
|
||||
***************
|
||||
*** 1,6 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/white" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,6 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
diff -crB from/res/drawable/drawable_circle_black.xml to/res/drawable/drawable_circle_black.xml
|
||||
*** from/res/drawable/drawable_circle_black.xml 2020-09-23 12:13:28.368702254 +0100
|
||||
--- to/res/drawable/drawable_circle_black.xml 2020-09-23 12:14:29.664686667 +0100
|
||||
***************
|
||||
*** 1,5 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/black" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,5 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
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-09-23 12:13:28.154702292 +0100
|
||||
--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-09-23 12:14:29.664686667 +0100
|
||||
***************
|
||||
*** 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-09-23 12:13:29.204702105 +0100
|
||||
--- to/res/values/colors.xml 2020-09-23 12:14:29.664686667 +0100
|
||||
***************
|
||||
*** 106,115 ****
|
||||
<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>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
--- 106,115 ----
|
||||
<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">#ff000000</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
***************
|
||||
*** 121,127 ****
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff121212</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
--- 121,127 ----
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff000000</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
***************
|
||||
*** 170,177 ****
|
||||
<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>
|
||||
--- 170,177 ----
|
||||
<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>
|
||||
***************
|
||||
*** 181,187 ****
|
||||
<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>
|
||||
--- 181,187 ----
|
||||
<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>
|
||||
***************
|
||||
*** 294,313 ****
|
||||
<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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
--- 294,313 ----
|
||||
<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">#ff000000</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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
***************
|
||||
*** 332,341 ****
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff36393f</color>
|
||||
! <color name="primary_dark_630">#ff2f3136</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff202225</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
--- 332,341 ----
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff000000</color>
|
||||
! <color name="primary_dark_630">#ff000000</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff000000</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
***************
|
||||
*** 381,389 ****
|
||||
<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>
|
||||
--- 381,389 ----
|
||||
<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>
|
||||
***************
|
||||
*** 522,528 ****
|
||||
<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>
|
||||
--- 522,528 ----
|
||||
<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-09-23 12:13:29.442702063 +0100
|
||||
--- to/res/values/styles.xml 2020-09-23 12:14:29.664686667 +0100
|
||||
***************
|
||||
*** 396,402 ****
|
||||
<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>
|
||||
--- 396,402 ----
|
||||
<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>
|
||||
***************
|
||||
*** 407,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_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_settings_empty">@drawable/img_empty_server_settings_emoji_dark</item>
|
||||
--- 407,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_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_settings_empty">@drawable/img_empty_server_settings_emoji_dark</item>
|
||||
***************
|
||||
*** 757,763 ****
|
||||
<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="bg_mentions">@drawable/drawable_overlay_mentions_primary_800</item>
|
||||
--- 757,763 ----
|
||||
<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="bg_mentions">@drawable/drawable_overlay_mentions_primary_800</item>
|
||||
***************
|
||||
*** 787,793 ****
|
||||
<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>
|
||||
--- 787,793 ----
|
||||
<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_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-09-23 12:13:31.990701598 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-09-23 12:14:29.664686667 +0100
|
||||
***************
|
||||
*** 82,88 ****
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f060275
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
--- 82,88 ----
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f060024
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
|
|
@ -0,0 +1,344 @@
|
|||
diff -crB from/res/drawable/drawable_bg_corners_20dp.xml to/res/drawable/drawable_bg_corners_20dp.xml
|
||||
*** from/res/drawable/drawable_bg_corners_20dp.xml 2020-09-23 12:13:27.638702380 +0100
|
||||
--- to/res/drawable/drawable_bg_corners_20dp.xml 2020-09-23 12:14:29.664686667 +0100
|
||||
***************
|
||||
*** 1,6 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/white" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,6 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
diff -crB from/res/drawable/drawable_circle_black.xml to/res/drawable/drawable_circle_black.xml
|
||||
*** from/res/drawable/drawable_circle_black.xml 2020-09-23 12:13:28.368702254 +0100
|
||||
--- to/res/drawable/drawable_circle_black.xml 2020-09-23 12:14:29.664686667 +0100
|
||||
***************
|
||||
*** 1,5 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/black" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,5 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
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-09-23 12:13:28.154702292 +0100
|
||||
--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-09-23 12:14:29.664686667 +0100
|
||||
***************
|
||||
*** 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-09-23 12:13:29.204702105 +0100
|
||||
--- to/res/values/colors.xml 2020-09-23 12:14:29.664686667 +0100
|
||||
***************
|
||||
*** 106,115 ****
|
||||
<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>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
--- 106,115 ----
|
||||
<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">#ff000000</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
***************
|
||||
*** 121,127 ****
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff121212</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
--- 121,127 ----
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff000000</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
***************
|
||||
*** 170,177 ****
|
||||
<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>
|
||||
--- 170,177 ----
|
||||
<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>
|
||||
***************
|
||||
*** 181,187 ****
|
||||
<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>
|
||||
--- 181,187 ----
|
||||
<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>
|
||||
***************
|
||||
*** 294,313 ****
|
||||
<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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
--- 294,313 ----
|
||||
<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">#ff000000</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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
***************
|
||||
*** 332,341 ****
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff36393f</color>
|
||||
! <color name="primary_dark_630">#ff2f3136</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff202225</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
--- 332,341 ----
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff000000</color>
|
||||
! <color name="primary_dark_630">#ff000000</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff000000</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
***************
|
||||
*** 381,389 ****
|
||||
<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>
|
||||
--- 381,389 ----
|
||||
<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>
|
||||
***************
|
||||
*** 522,528 ****
|
||||
<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>
|
||||
--- 522,528 ----
|
||||
<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-09-23 12:13:29.442702063 +0100
|
||||
--- to/res/values/styles.xml 2020-09-23 12:14:29.664686667 +0100
|
||||
***************
|
||||
*** 396,402 ****
|
||||
<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>
|
||||
--- 396,402 ----
|
||||
<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>
|
||||
***************
|
||||
*** 407,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_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_settings_empty">@drawable/img_empty_server_settings_emoji_dark</item>
|
||||
--- 407,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_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_settings_empty">@drawable/img_empty_server_settings_emoji_dark</item>
|
||||
***************
|
||||
*** 757,763 ****
|
||||
<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="bg_mentions">@drawable/drawable_overlay_mentions_primary_800</item>
|
||||
--- 757,763 ----
|
||||
<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="bg_mentions">@drawable/drawable_overlay_mentions_primary_800</item>
|
||||
***************
|
||||
*** 787,793 ****
|
||||
<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>
|
||||
--- 787,793 ----
|
||||
<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_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-09-23 12:13:31.990701598 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-09-23 12:14:29.664686667 +0100
|
||||
***************
|
||||
*** 82,88 ****
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f060275
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
--- 82,88 ----
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f060024
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
|
|
@ -0,0 +1,344 @@
|
|||
diff -crB from/res/drawable/drawable_bg_corners_20dp.xml to/res/drawable/drawable_bg_corners_20dp.xml
|
||||
*** from/res/drawable/drawable_bg_corners_20dp.xml 2020-09-29 13:35:42.756530932 +0100
|
||||
--- to/res/drawable/drawable_bg_corners_20dp.xml 2020-09-29 13:39:04.930199342 +0100
|
||||
***************
|
||||
*** 1,6 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/white" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,6 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
<corners android:radius="20.0dip" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
diff -crB from/res/drawable/drawable_circle_black.xml to/res/drawable/drawable_circle_black.xml
|
||||
*** from/res/drawable/drawable_circle_black.xml 2020-09-29 13:35:42.764532046 +0100
|
||||
--- to/res/drawable/drawable_circle_black.xml 2020-09-29 13:39:04.930199342 +0100
|
||||
***************
|
||||
*** 1,5 ****
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@color/black" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
--- 1,5 ----
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="oval"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
! <solid android:color="@android:color/transparent" />
|
||||
</shape>
|
||||
\ No newline at end of file
|
||||
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-09-29 13:35:41.480352022 +0100
|
||||
--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-09-29 13:39:04.930199342 +0100
|
||||
***************
|
||||
*** 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-09-29 13:35:43.426623297 +0100
|
||||
--- to/res/values/colors.xml 2020-09-29 13:39:04.930199342 +0100
|
||||
***************
|
||||
*** 110,119 ****
|
||||
<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>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
--- 110,119 ----
|
||||
<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">#ff000000</color>
|
||||
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||||
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||||
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||||
***************
|
||||
*** 125,131 ****
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff121212</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
--- 125,131 ----
|
||||
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||||
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||||
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||||
! <color name="design_dark_default_color_surface">#ff000000</color>
|
||||
<color name="design_default_color_background">#ffffffff</color>
|
||||
<color name="design_default_color_error">#ffb00020</color>
|
||||
<color name="design_default_color_on_background">#ff000000</color>
|
||||
***************
|
||||
*** 174,181 ****
|
||||
<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>
|
||||
--- 174,181 ----
|
||||
<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>
|
||||
***************
|
||||
*** 185,191 ****
|
||||
<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>
|
||||
--- 185,191 ----
|
||||
<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>
|
||||
***************
|
||||
*** 298,317 ****
|
||||
<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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
--- 298,317 ----
|
||||
<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">#ff000000</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_50">#8018191c</color>
|
||||
<color name="primary_800_alpha_60">#9918191c</color>
|
||||
***************
|
||||
*** 336,345 ****
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff36393f</color>
|
||||
! <color name="primary_dark_630">#ff2f3136</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff202225</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
--- 336,345 ----
|
||||
<color name="primary_dark_500">#ff4f545c</color>
|
||||
<color name="primary_dark_530">#ff484c54</color>
|
||||
<color name="primary_dark_560">#ff40444b</color>
|
||||
! <color name="primary_dark_600">#ff000000</color>
|
||||
! <color name="primary_dark_630">#ff000000</color>
|
||||
<color name="primary_dark_660">#ff292b2f</color>
|
||||
! <color name="primary_dark_700">#ff000000</color>
|
||||
<color name="primary_dark_730">#ff1e1f22</color>
|
||||
<color name="primary_dark_760">#ff1b1d20</color>
|
||||
<color name="primary_dark_800">#ff18191c</color>
|
||||
***************
|
||||
*** 385,393 ****
|
||||
<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>
|
||||
--- 385,393 ----
|
||||
<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>
|
||||
***************
|
||||
*** 526,532 ****
|
||||
<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>
|
||||
--- 526,532 ----
|
||||
<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-09-29 13:35:43.168587940 +0100
|
||||
--- to/res/values/styles.xml 2020-09-29 13:39:04.930199342 +0100
|
||||
***************
|
||||
*** 421,427 ****
|
||||
<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>
|
||||
--- 421,427 ----
|
||||
<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>
|
||||
***************
|
||||
*** 432,444 ****
|
||||
<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_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_settings_empty">@drawable/img_empty_server_settings_emoji_dark</item>
|
||||
--- 432,444 ----
|
||||
<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_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_settings_empty">@drawable/img_empty_server_settings_emoji_dark</item>
|
||||
***************
|
||||
*** 785,791 ****
|
||||
<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="bg_mentions">@drawable/drawable_overlay_mentions_primary_800</item>
|
||||
--- 785,791 ----
|
||||
<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="bg_mentions">@drawable/drawable_overlay_mentions_primary_800</item>
|
||||
***************
|
||||
*** 815,821 ****
|
||||
<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>
|
||||
--- 815,821 ----
|
||||
<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_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-09-29 13:35:46.483032643 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali 2020-09-29 13:39:24.923329975 +0100
|
||||
***************
|
||||
*** 82,88 ****
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f060279
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
--- 82,88 ----
|
||||
.line 3
|
||||
iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
|
||||
|
||||
! const v1, 0x7f060024
|
||||
|
||||
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
|
||||
|
||||
|
|
@ -185,6 +185,16 @@ Self note: Top bar color is set by `setStatusBarColorResourceId`
|
|||
- 34.3
|
||||
- 35.0-alpha1
|
||||
- 36.3
|
||||
- 36.5
|
||||
- 38.0
|
||||
- 38.1
|
||||
- 40.04
|
||||
- 41.02
|
||||
- 41.05
|
||||
- 41.06
|
||||
- 41.10
|
||||
- 41.11
|
||||
- 42.0
|
||||
|
||||
#### Value reference
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,2 @@
|
|||
#!/bin/bash
|
||||
\cp "$1" res/drawable-xxhdpi/img_loading_clyde.png
|
||||
\cp "$1" res/drawable-xxxhdpi/img_loading_clyde.png
|
||||
\cp "$1" res/drawable-xxxhdpi/img_loading_logo.png
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-08-20 11:50:18.660000000 +0300
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-08-20 13:20:24.220000000 +0300
|
||||
***************
|
||||
*** 2056,2062 ****
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 36.5 (1246)"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
--- 2056,2062 ----
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 36.5 (1246), with Cutthecord patches"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
Only in to/smali_classes2/com/discord/widgets/settings: WidgetSettings.smali.orig
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-08-27 13:05:47.180000000 +0300
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-08-27 13:06:04.920000000 +0300
|
||||
***************
|
||||
*** 2121,2127 ****
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 38.0 (1249)"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
--- 2121,2127 ----
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 38.0 (1249), with Cutthecord patches"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
diff -crB from/smali/com/discord/widgets/settings/WidgetSettings.smali to/smali/com/discord/widgets/settings/WidgetSettings.smali
|
||||
*** from/smali/com/discord/widgets/settings/WidgetSettings.smali 2020-09-07 10:44:49.761496433 +0100
|
||||
--- to/smali/com/discord/widgets/settings/WidgetSettings.smali 2020-09-07 10:55:26.842202421 +0100
|
||||
***************
|
||||
*** 1982,1988 ****
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 38.1 (1251)"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
--- 1982,1988 ----
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 38.1 (1251), with Cutthecord patches"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
Only in to/smali/com/discord/widgets/settings: WidgetSettings.smali.orig
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-09-08 10:40:47.311468451 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-09-08 10:41:01.733563309 +0100
|
||||
***************
|
||||
*** 2183,2189 ****
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 38.1 (1252)"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
--- 2183,2189 ----
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 38.1 (1252), with Cutthecord patches"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-09-13 11:49:34.923189763 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-09-13 11:49:51.718100884 +0100
|
||||
***************
|
||||
*** 1982,1988 ****
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 40.04 (1259)"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
--- 1982,1988 ----
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 40.04 (1259), with Cutthecord patches"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-09-13 11:49:34.923189763 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-09-13 11:49:51.718100884 +0100
|
||||
***************
|
||||
*** 1982,1988 ****
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 41.02 (1266)"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
--- 1982,1988 ----
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 41.02 (1266), with Cutthecord patches"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-09-13 11:49:34.923189763 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-09-13 11:49:51.718100884 +0100
|
||||
***************
|
||||
*** 1982,1988 ****
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 41.05 (1270)"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
--- 1982,1988 ----
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 41.05 (1270), with Cutthecord patches"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-09-13 11:49:34.923189763 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-09-13 11:49:51.718100884 +0100
|
||||
***************
|
||||
*** 1982,1988 ****
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 41.06 (1273)"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
--- 1982,1988 ----
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 41.06 (1273), with Cutthecord patches"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-09-23 12:13:31.922701611 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-09-23 12:14:25.720687948 +0100
|
||||
***************
|
||||
*** 2011,2017 ****
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 41.10 (1279)"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
--- 2011,2017 ----
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 41.10 (1279), with Cutthecord patches"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-09-23 12:13:31.922701611 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-09-23 12:14:25.720687948 +0100
|
||||
***************
|
||||
*** 2011,2017 ****
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 41.11 (1280)"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
--- 2011,2017 ----
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 41.11 (1280), with Cutthecord patches"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-09-23 12:13:31.922701611 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2020-09-23 12:14:25.720687948 +0100
|
||||
***************
|
||||
*** 2011,2017 ****
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 42.0 (1281)"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
--- 2011,2017 ----
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
! const-string v0, " - 42.0 (1281), with Cutthecord patches"
|
||||
|
||||
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
|
|
@ -179,4 +179,14 @@ This patch replaces version string and adds mention of cutthecord in the user se
|
|||
- 34.3
|
||||
- 35.0-alpha1
|
||||
- 36.3
|
||||
- 36.5
|
||||
- 38.0
|
||||
- 38.1
|
||||
- 40.04
|
||||
- 41.02
|
||||
- 41.05
|
||||
- 41.06
|
||||
- 41.10
|
||||
- 41.11
|
||||
- 42.0
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,96 @@
|
|||
Only in com.discord: build
|
||||
Only in com.discord: dist
|
||||
diff --color -crB com.discord-base/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
|
||||
*** com.discord-base/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-07-29 21:27:28.163447492 +0300
|
||||
--- com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-07-29 23:32:55.123412443 +0300
|
||||
***************
|
||||
*** 317,387 ****
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! sget-object v0, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->superProperties$delegate:Lkotlin/properties/ReadWriteProperty;
|
||||
!
|
||||
! sget-object v1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
|
||||
!
|
||||
! const/4 v2, 0x0
|
||||
!
|
||||
! aget-object v1, v1, v2
|
||||
!
|
||||
! invoke-interface {v0, p0, v1, p1}, Lkotlin/properties/ReadWriteProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 1
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! monitor-enter p0
|
||||
!
|
||||
! .line 1
|
||||
! :try_start_0
|
||||
! invoke-virtual {p0}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->getSuperProperties()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! invoke-static {v0, p1}, Lf/n/a/k/a;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
|
||||
!
|
||||
! move-result-object p1
|
||||
!
|
||||
! invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->setSuperProperties(Ljava/util/Map;)V
|
||||
! :try_end_0
|
||||
! .catchall {:try_start_0 .. :try_end_0} :catchall_0
|
||||
!
|
||||
! .line 2
|
||||
! monitor-exit p0
|
||||
|
||||
return-void
|
||||
-
|
||||
- :catchall_0
|
||||
- move-exception p1
|
||||
-
|
||||
- monitor-exit p0
|
||||
-
|
||||
- throw p1
|
||||
.end method
|
||||
|
||||
|
||||
--- 317,331 ----
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
||||
Only in com.discord/smali/com/discord/utilities/analytics: AnalyticSuperProperties.smali.orig
|
||||
|
||||
|
|
@ -0,0 +1,96 @@
|
|||
Only in com.discord: build
|
||||
Only in com.discord: dist
|
||||
diff --color -crB com.discord-base/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
|
||||
*** com.discord-base/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-07-29 21:27:28.163447492 +0300
|
||||
--- com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-07-29 23:32:55.123412443 +0300
|
||||
***************
|
||||
*** 317,387 ****
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! sget-object v0, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->superProperties$delegate:Lkotlin/properties/ReadWriteProperty;
|
||||
!
|
||||
! sget-object v1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
|
||||
!
|
||||
! const/4 v2, 0x0
|
||||
!
|
||||
! aget-object v1, v1, v2
|
||||
!
|
||||
! invoke-interface {v0, p0, v1, p1}, Lkotlin/properties/ReadWriteProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 1
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! monitor-enter p0
|
||||
!
|
||||
! .line 1
|
||||
! :try_start_0
|
||||
! invoke-virtual {p0}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->getSuperProperties()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! invoke-static {v0, p1}, Lf/n/a/k/a;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
|
||||
!
|
||||
! move-result-object p1
|
||||
!
|
||||
! invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->setSuperProperties(Ljava/util/Map;)V
|
||||
! :try_end_0
|
||||
! .catchall {:try_start_0 .. :try_end_0} :catchall_0
|
||||
!
|
||||
! .line 2
|
||||
! monitor-exit p0
|
||||
|
||||
return-void
|
||||
-
|
||||
- :catchall_0
|
||||
- move-exception p1
|
||||
-
|
||||
- monitor-exit p0
|
||||
-
|
||||
- throw p1
|
||||
.end method
|
||||
|
||||
|
||||
--- 317,331 ----
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
||||
Only in com.discord/smali/com/discord/utilities/analytics: AnalyticSuperProperties.smali.orig
|
||||
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
|
||||
*** from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-09-07 10:44:49.181501278 +0100
|
||||
--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-09-07 10:44:56.741438131 +0100
|
||||
***************
|
||||
*** 313,383 ****
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! sget-object v0, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->superProperties$delegate:Lkotlin/properties/ReadWriteProperty;
|
||||
!
|
||||
! sget-object v1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
|
||||
!
|
||||
! const/4 v2, 0x0
|
||||
!
|
||||
! aget-object v1, v1, v2
|
||||
!
|
||||
! invoke-interface {v0, p0, v1, p1}, Lkotlin/properties/ReadWriteProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 1
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! monitor-enter p0
|
||||
!
|
||||
! .line 1
|
||||
! :try_start_0
|
||||
! invoke-virtual {p0}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->getSuperProperties()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! invoke-static {v0, p1}, Lf/n/a/k/a;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
|
||||
!
|
||||
! move-result-object p1
|
||||
!
|
||||
! invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->setSuperProperties(Ljava/util/Map;)V
|
||||
! :try_end_0
|
||||
! .catchall {:try_start_0 .. :try_end_0} :catchall_0
|
||||
!
|
||||
! .line 2
|
||||
! monitor-exit p0
|
||||
|
||||
return-void
|
||||
-
|
||||
- :catchall_0
|
||||
- move-exception p1
|
||||
-
|
||||
- monitor-exit p0
|
||||
-
|
||||
- throw p1
|
||||
.end method
|
||||
|
||||
|
||||
--- 313,327 ----
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,96 @@
|
|||
Only in com.discord: build
|
||||
Only in com.discord: dist
|
||||
diff --color -crB com.discord-base/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
|
||||
*** com.discord-base/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-07-29 21:27:28.163447492 +0300
|
||||
--- com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-07-29 23:32:55.123412443 +0300
|
||||
***************
|
||||
*** 317,387 ****
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! sget-object v0, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->superProperties$delegate:Lkotlin/properties/ReadWriteProperty;
|
||||
!
|
||||
! sget-object v1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
|
||||
!
|
||||
! const/4 v2, 0x0
|
||||
!
|
||||
! aget-object v1, v1, v2
|
||||
!
|
||||
! invoke-interface {v0, p0, v1, p1}, Lkotlin/properties/ReadWriteProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 1
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! monitor-enter p0
|
||||
!
|
||||
! .line 1
|
||||
! :try_start_0
|
||||
! invoke-virtual {p0}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->getSuperProperties()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! invoke-static {v0, p1}, Lf/n/a/k/a;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
|
||||
!
|
||||
! move-result-object p1
|
||||
!
|
||||
! invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->setSuperProperties(Ljava/util/Map;)V
|
||||
! :try_end_0
|
||||
! .catchall {:try_start_0 .. :try_end_0} :catchall_0
|
||||
!
|
||||
! .line 2
|
||||
! monitor-exit p0
|
||||
|
||||
return-void
|
||||
-
|
||||
- :catchall_0
|
||||
- move-exception p1
|
||||
-
|
||||
- monitor-exit p0
|
||||
-
|
||||
- throw p1
|
||||
.end method
|
||||
|
||||
|
||||
--- 317,331 ----
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
||||
Only in com.discord/smali/com/discord/utilities/analytics: AnalyticSuperProperties.smali.orig
|
||||
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
|
||||
*** from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-09-13 11:49:34.137158635 +0100
|
||||
--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-09-13 11:50:55.409852589 +0100
|
||||
***************
|
||||
*** 313,383 ****
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! sget-object v0, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->superProperties$delegate:Lkotlin/properties/ReadWriteProperty;
|
||||
!
|
||||
! sget-object v1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
|
||||
!
|
||||
! const/4 v2, 0x0
|
||||
!
|
||||
! aget-object v1, v1, v2
|
||||
!
|
||||
! invoke-interface {v0, p0, v1, p1}, Lkotlin/properties/ReadWriteProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 1
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! monitor-enter p0
|
||||
!
|
||||
! .line 1
|
||||
! :try_start_0
|
||||
! invoke-virtual {p0}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->getSuperProperties()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! invoke-static {v0, p1}, Lf/h/a/f/e/n/f;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
|
||||
!
|
||||
! move-result-object p1
|
||||
!
|
||||
! invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->setSuperProperties(Ljava/util/Map;)V
|
||||
! :try_end_0
|
||||
! .catchall {:try_start_0 .. :try_end_0} :catchall_0
|
||||
!
|
||||
! .line 2
|
||||
! monitor-exit p0
|
||||
|
||||
return-void
|
||||
-
|
||||
- :catchall_0
|
||||
- move-exception p1
|
||||
-
|
||||
- monitor-exit p0
|
||||
-
|
||||
- throw p1
|
||||
.end method
|
||||
|
||||
|
||||
--- 313,327 ----
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
|
||||
*** from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-09-13 11:49:34.137158635 +0100
|
||||
--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-09-13 11:50:55.409852589 +0100
|
||||
***************
|
||||
*** 313,383 ****
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! sget-object v0, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->superProperties$delegate:Lkotlin/properties/ReadWriteProperty;
|
||||
!
|
||||
! sget-object v1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
|
||||
!
|
||||
! const/4 v2, 0x0
|
||||
!
|
||||
! aget-object v1, v1, v2
|
||||
!
|
||||
! invoke-interface {v0, p0, v1, p1}, Lkotlin/properties/ReadWriteProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 1
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! monitor-enter p0
|
||||
!
|
||||
! .line 1
|
||||
! :try_start_0
|
||||
! invoke-virtual {p0}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->getSuperProperties()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! invoke-static {v0, p1}, Lf/h/a/f/e/n/f;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
|
||||
!
|
||||
! move-result-object p1
|
||||
!
|
||||
! invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->setSuperProperties(Ljava/util/Map;)V
|
||||
! :try_end_0
|
||||
! .catchall {:try_start_0 .. :try_end_0} :catchall_0
|
||||
!
|
||||
! .line 2
|
||||
! monitor-exit p0
|
||||
|
||||
return-void
|
||||
-
|
||||
- :catchall_0
|
||||
- move-exception p1
|
||||
-
|
||||
- monitor-exit p0
|
||||
-
|
||||
- throw p1
|
||||
.end method
|
||||
|
||||
|
||||
--- 313,327 ----
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
|
||||
*** from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-09-13 11:49:34.137158635 +0100
|
||||
--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-09-13 11:50:55.409852589 +0100
|
||||
***************
|
||||
*** 313,383 ****
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! sget-object v0, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->superProperties$delegate:Lkotlin/properties/ReadWriteProperty;
|
||||
!
|
||||
! sget-object v1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
|
||||
!
|
||||
! const/4 v2, 0x0
|
||||
!
|
||||
! aget-object v1, v1, v2
|
||||
!
|
||||
! invoke-interface {v0, p0, v1, p1}, Lkotlin/properties/ReadWriteProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 1
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! monitor-enter p0
|
||||
!
|
||||
! .line 1
|
||||
! :try_start_0
|
||||
! invoke-virtual {p0}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->getSuperProperties()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! invoke-static {v0, p1}, Lf/h/a/f/e/n/f;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
|
||||
!
|
||||
! move-result-object p1
|
||||
!
|
||||
! invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->setSuperProperties(Ljava/util/Map;)V
|
||||
! :try_end_0
|
||||
! .catchall {:try_start_0 .. :try_end_0} :catchall_0
|
||||
!
|
||||
! .line 2
|
||||
! monitor-exit p0
|
||||
|
||||
return-void
|
||||
-
|
||||
- :catchall_0
|
||||
- move-exception p1
|
||||
-
|
||||
- monitor-exit p0
|
||||
-
|
||||
- throw p1
|
||||
.end method
|
||||
|
||||
|
||||
--- 313,327 ----
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
|
||||
*** from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-09-13 11:49:34.137158635 +0100
|
||||
--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-09-13 11:50:55.409852589 +0100
|
||||
***************
|
||||
*** 313,383 ****
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! sget-object v0, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->superProperties$delegate:Lkotlin/properties/ReadWriteProperty;
|
||||
!
|
||||
! sget-object v1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
|
||||
!
|
||||
! const/4 v2, 0x0
|
||||
!
|
||||
! aget-object v1, v1, v2
|
||||
!
|
||||
! invoke-interface {v0, p0, v1, p1}, Lkotlin/properties/ReadWriteProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 1
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! monitor-enter p0
|
||||
!
|
||||
! .line 1
|
||||
! :try_start_0
|
||||
! invoke-virtual {p0}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->getSuperProperties()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! invoke-static {v0, p1}, Lf/h/a/f/e/n/f;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
|
||||
!
|
||||
! move-result-object p1
|
||||
!
|
||||
! invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->setSuperProperties(Ljava/util/Map;)V
|
||||
! :try_end_0
|
||||
! .catchall {:try_start_0 .. :try_end_0} :catchall_0
|
||||
!
|
||||
! .line 2
|
||||
! monitor-exit p0
|
||||
|
||||
return-void
|
||||
-
|
||||
- :catchall_0
|
||||
- move-exception p1
|
||||
-
|
||||
- monitor-exit p0
|
||||
-
|
||||
- throw p1
|
||||
.end method
|
||||
|
||||
|
||||
--- 313,327 ----
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
|
||||
*** from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-09-13 11:49:34.137158635 +0100
|
||||
--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-09-13 11:50:55.409852589 +0100
|
||||
***************
|
||||
*** 313,383 ****
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! sget-object v0, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->superProperties$delegate:Lkotlin/properties/ReadWriteProperty;
|
||||
!
|
||||
! sget-object v1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
|
||||
!
|
||||
! const/4 v2, 0x0
|
||||
!
|
||||
! aget-object v1, v1, v2
|
||||
!
|
||||
! invoke-interface {v0, p0, v1, p1}, Lkotlin/properties/ReadWriteProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 1
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! monitor-enter p0
|
||||
!
|
||||
! .line 1
|
||||
! :try_start_0
|
||||
! invoke-virtual {p0}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->getSuperProperties()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! invoke-static {v0, p1}, Lf/h/a/f/e/n/f;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
|
||||
!
|
||||
! move-result-object p1
|
||||
!
|
||||
! invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->setSuperProperties(Ljava/util/Map;)V
|
||||
! :try_end_0
|
||||
! .catchall {:try_start_0 .. :try_end_0} :catchall_0
|
||||
!
|
||||
! .line 2
|
||||
! monitor-exit p0
|
||||
|
||||
return-void
|
||||
-
|
||||
- :catchall_0
|
||||
- move-exception p1
|
||||
-
|
||||
- monitor-exit p0
|
||||
-
|
||||
- throw p1
|
||||
.end method
|
||||
|
||||
|
||||
--- 313,327 ----
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
|
||||
*** from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-09-13 11:49:34.137158635 +0100
|
||||
--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-09-13 11:50:55.409852589 +0100
|
||||
***************
|
||||
*** 313,383 ****
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! sget-object v0, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->superProperties$delegate:Lkotlin/properties/ReadWriteProperty;
|
||||
!
|
||||
! sget-object v1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
|
||||
!
|
||||
! const/4 v2, 0x0
|
||||
!
|
||||
! aget-object v1, v1, v2
|
||||
!
|
||||
! invoke-interface {v0, p0, v1, p1}, Lkotlin/properties/ReadWriteProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 1
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! monitor-enter p0
|
||||
!
|
||||
! .line 1
|
||||
! :try_start_0
|
||||
! invoke-virtual {p0}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->getSuperProperties()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! invoke-static {v0, p1}, Lf/h/a/f/e/n/f;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
|
||||
!
|
||||
! move-result-object p1
|
||||
!
|
||||
! invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->setSuperProperties(Ljava/util/Map;)V
|
||||
! :try_end_0
|
||||
! .catchall {:try_start_0 .. :try_end_0} :catchall_0
|
||||
!
|
||||
! .line 2
|
||||
! monitor-exit p0
|
||||
|
||||
return-void
|
||||
-
|
||||
- :catchall_0
|
||||
- move-exception p1
|
||||
-
|
||||
- monitor-exit p0
|
||||
-
|
||||
- throw p1
|
||||
.end method
|
||||
|
||||
|
||||
--- 313,327 ----
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
|
||||
*** from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-09-13 11:49:34.137158635 +0100
|
||||
--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2020-09-13 11:50:55.409852589 +0100
|
||||
***************
|
||||
*** 313,383 ****
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! sget-object v0, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->superProperties$delegate:Lkotlin/properties/ReadWriteProperty;
|
||||
!
|
||||
! sget-object v1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
|
||||
!
|
||||
! const/4 v2, 0x0
|
||||
!
|
||||
! aget-object v1, v1, v2
|
||||
!
|
||||
! invoke-interface {v0, p0, v1, p1}, Lkotlin/properties/ReadWriteProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 1
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Map<",
|
||||
! "Ljava/lang/String;",
|
||||
! "+",
|
||||
! "Ljava/lang/Object;",
|
||||
! ">;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
!
|
||||
! monitor-enter p0
|
||||
!
|
||||
! .line 1
|
||||
! :try_start_0
|
||||
! invoke-virtual {p0}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->getSuperProperties()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! invoke-static {v0, p1}, Lf/h/a/f/e/n/f;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
|
||||
!
|
||||
! move-result-object p1
|
||||
!
|
||||
! invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->setSuperProperties(Ljava/util/Map;)V
|
||||
! :try_end_0
|
||||
! .catchall {:try_start_0 .. :try_end_0} :catchall_0
|
||||
!
|
||||
! .line 2
|
||||
! monitor-exit p0
|
||||
|
||||
return-void
|
||||
-
|
||||
- :catchall_0
|
||||
- move-exception p1
|
||||
-
|
||||
- monitor-exit p0
|
||||
-
|
||||
- throw p1
|
||||
.end method
|
||||
|
||||
|
||||
--- 313,327 ----
|
||||
.end method
|
||||
|
||||
.method private final setSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
.method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
||||
|
|
@ -180,4 +180,14 @@ Between 8.3.0 and 33.1: This patch replaces the browser name from "Discord Andro
|
|||
- 34.3
|
||||
- 35.0-alpha1
|
||||
- 36.3
|
||||
- 36.5
|
||||
- 38.0
|
||||
- 38.1
|
||||
- 40.04
|
||||
- 41.02
|
||||
- 41.05
|
||||
- 41.06
|
||||
- 41.10
|
||||
- 41.11
|
||||
- 42.0
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,91 @@
|
|||
diff -crB from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
|
||||
*** from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-08-22 13:24:24.120000000 +0300
|
||||
--- to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-08-22 14:25:40.980000000 +0300
|
||||
***************
|
||||
*** 476,552 ****
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Collection<",
|
||||
! "Lcom/discord/simpleast/core/node/Node<",
|
||||
! "Lcom/discord/utilities/textprocessing/MessageRenderContext;",
|
||||
! ">;>;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
|
||||
- .line 1
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- const/4 v1, 0x1
|
||||
-
|
||||
- if-ne v0, v1, :cond_2
|
||||
-
|
||||
- iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- invoke-interface {v0}, Ljava/util/List;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eq v0, v1, :cond_0
|
||||
-
|
||||
- goto :goto_0
|
||||
-
|
||||
- :cond_0
|
||||
- const/4 v0, 0x0
|
||||
-
|
||||
- .line 2
|
||||
- invoke-static {p1, v0}, Lj0/i/l;->elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v1
|
||||
-
|
||||
- check-cast v1, Lcom/discord/simpleast/core/node/Node;
|
||||
-
|
||||
- .line 3
|
||||
- iget-object v2, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v0
|
||||
-
|
||||
- check-cast v0, Lcom/discord/models/domain/ModelMessageEmbed;
|
||||
-
|
||||
- .line 4
|
||||
- instance-of v1, v1, Lcom/discord/utilities/textprocessing/node/UrlNode;
|
||||
-
|
||||
- if-nez v1, :cond_1
|
||||
-
|
||||
- return-void
|
||||
-
|
||||
- .line 5
|
||||
- :cond_1
|
||||
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageEmbed;->isSimpleEmbed()Z
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- .line 6
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->clear()V
|
||||
-
|
||||
- :cond_2
|
||||
- :goto_0
|
||||
return-void
|
||||
.end method
|
||||
|
||||
--- 476,483 ----
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
|
@ -0,0 +1,91 @@
|
|||
diff -crB from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
|
||||
*** from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-08-22 13:24:24.120000000 +0300
|
||||
--- to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-08-22 14:25:40.980000000 +0300
|
||||
***************
|
||||
*** 476,552 ****
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Collection<",
|
||||
! "Lcom/discord/simpleast/core/node/Node<",
|
||||
! "Lcom/discord/utilities/textprocessing/MessageRenderContext;",
|
||||
! ">;>;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
|
||||
- .line 1
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- const/4 v1, 0x1
|
||||
-
|
||||
- if-ne v0, v1, :cond_2
|
||||
-
|
||||
- iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- invoke-interface {v0}, Ljava/util/List;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eq v0, v1, :cond_0
|
||||
-
|
||||
- goto :goto_0
|
||||
-
|
||||
- :cond_0
|
||||
- const/4 v0, 0x0
|
||||
-
|
||||
- .line 2
|
||||
- invoke-static {p1, v0}, Lj0/i/l;->elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v1
|
||||
-
|
||||
- check-cast v1, Lcom/discord/simpleast/core/node/Node;
|
||||
-
|
||||
- .line 3
|
||||
- iget-object v2, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v0
|
||||
-
|
||||
- check-cast v0, Lcom/discord/models/domain/ModelMessageEmbed;
|
||||
-
|
||||
- .line 4
|
||||
- instance-of v1, v1, Lcom/discord/utilities/textprocessing/node/UrlNode;
|
||||
-
|
||||
- if-nez v1, :cond_1
|
||||
-
|
||||
- return-void
|
||||
-
|
||||
- .line 5
|
||||
- :cond_1
|
||||
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageEmbed;->isSimpleEmbed()Z
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- .line 6
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->clear()V
|
||||
-
|
||||
- :cond_2
|
||||
- :goto_0
|
||||
return-void
|
||||
.end method
|
||||
|
||||
--- 476,483 ----
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
|
@ -0,0 +1,91 @@
|
|||
diff -crB from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
|
||||
*** from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-09-07 10:44:49.317500142 +0100
|
||||
--- to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-09-07 10:46:14.260791240 +0100
|
||||
***************
|
||||
*** 476,552 ****
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Collection<",
|
||||
! "Lcom/discord/simpleast/core/node/Node<",
|
||||
! "Lcom/discord/utilities/textprocessing/MessageRenderContext;",
|
||||
! ">;>;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
|
||||
- .line 1
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- const/4 v1, 0x1
|
||||
-
|
||||
- if-ne v0, v1, :cond_2
|
||||
-
|
||||
- iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- invoke-interface {v0}, Ljava/util/List;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eq v0, v1, :cond_0
|
||||
-
|
||||
- goto :goto_0
|
||||
-
|
||||
- :cond_0
|
||||
- const/4 v0, 0x0
|
||||
-
|
||||
- .line 2
|
||||
- invoke-static {p1, v0}, Lk0/j/l;->elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v1
|
||||
-
|
||||
- check-cast v1, Lcom/discord/simpleast/core/node/Node;
|
||||
-
|
||||
- .line 3
|
||||
- iget-object v2, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v0
|
||||
-
|
||||
- check-cast v0, Lcom/discord/models/domain/ModelMessageEmbed;
|
||||
-
|
||||
- .line 4
|
||||
- instance-of v1, v1, Lcom/discord/utilities/textprocessing/node/UrlNode;
|
||||
-
|
||||
- if-nez v1, :cond_1
|
||||
-
|
||||
- return-void
|
||||
-
|
||||
- .line 5
|
||||
- :cond_1
|
||||
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageEmbed;->isSimpleEmbed()Z
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- .line 6
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->clear()V
|
||||
-
|
||||
- :cond_2
|
||||
- :goto_0
|
||||
return-void
|
||||
.end method
|
||||
|
||||
--- 476,483 ----
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
|
@ -0,0 +1,91 @@
|
|||
diff -crB from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
|
||||
*** from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-09-08 10:40:46.599463768 +0100
|
||||
--- to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-09-08 10:43:23.938498616 +0100
|
||||
***************
|
||||
*** 476,552 ****
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Collection<",
|
||||
! "Lcom/discord/simpleast/core/node/Node<",
|
||||
! "Lcom/discord/utilities/textprocessing/MessageRenderContext;",
|
||||
! ">;>;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
|
||||
- .line 1
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- const/4 v1, 0x1
|
||||
-
|
||||
- if-ne v0, v1, :cond_2
|
||||
-
|
||||
- iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- invoke-interface {v0}, Ljava/util/List;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eq v0, v1, :cond_0
|
||||
-
|
||||
- goto :goto_0
|
||||
-
|
||||
- :cond_0
|
||||
- const/4 v0, 0x0
|
||||
-
|
||||
- .line 2
|
||||
- invoke-static {p1, v0}, Lk0/i/l;->elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v1
|
||||
-
|
||||
- check-cast v1, Lcom/discord/simpleast/core/node/Node;
|
||||
-
|
||||
- .line 3
|
||||
- iget-object v2, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v0
|
||||
-
|
||||
- check-cast v0, Lcom/discord/models/domain/ModelMessageEmbed;
|
||||
-
|
||||
- .line 4
|
||||
- instance-of v1, v1, Lcom/discord/utilities/textprocessing/node/UrlNode;
|
||||
-
|
||||
- if-nez v1, :cond_1
|
||||
-
|
||||
- return-void
|
||||
-
|
||||
- .line 5
|
||||
- :cond_1
|
||||
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageEmbed;->isSimpleEmbed()Z
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- .line 6
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->clear()V
|
||||
-
|
||||
- :cond_2
|
||||
- :goto_0
|
||||
return-void
|
||||
.end method
|
||||
|
||||
--- 476,483 ----
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
|
@ -0,0 +1,91 @@
|
|||
diff -crB from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
|
||||
*** from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-09-13 11:49:34.217161804 +0100
|
||||
--- to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-09-13 11:52:23.983735280 +0100
|
||||
***************
|
||||
*** 476,552 ****
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Collection<",
|
||||
! "Lcom/discord/simpleast/core/node/Node<",
|
||||
! "Lcom/discord/utilities/textprocessing/MessageRenderContext;",
|
||||
! ">;>;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
|
||||
- .line 1
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- const/4 v1, 0x1
|
||||
-
|
||||
- if-ne v0, v1, :cond_2
|
||||
-
|
||||
- iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- invoke-interface {v0}, Ljava/util/List;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eq v0, v1, :cond_0
|
||||
-
|
||||
- goto :goto_0
|
||||
-
|
||||
- :cond_0
|
||||
- const/4 v0, 0x0
|
||||
-
|
||||
- .line 2
|
||||
- invoke-static {p1, v0}, Lk0/i/f;->elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v1
|
||||
-
|
||||
- check-cast v1, Lcom/discord/simpleast/core/node/Node;
|
||||
-
|
||||
- .line 3
|
||||
- iget-object v2, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v0
|
||||
-
|
||||
- check-cast v0, Lcom/discord/models/domain/ModelMessageEmbed;
|
||||
-
|
||||
- .line 4
|
||||
- instance-of v1, v1, Lcom/discord/utilities/textprocessing/node/UrlNode;
|
||||
-
|
||||
- if-nez v1, :cond_1
|
||||
-
|
||||
- return-void
|
||||
-
|
||||
- .line 5
|
||||
- :cond_1
|
||||
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageEmbed;->isSimpleEmbed()Z
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- .line 6
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->clear()V
|
||||
-
|
||||
- :cond_2
|
||||
- :goto_0
|
||||
return-void
|
||||
.end method
|
||||
|
||||
--- 476,483 ----
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
|
@ -0,0 +1,91 @@
|
|||
diff -crB from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
|
||||
*** from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-09-13 11:49:34.217161804 +0100
|
||||
--- to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-09-13 11:52:23.983735280 +0100
|
||||
***************
|
||||
*** 476,552 ****
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Collection<",
|
||||
! "Lcom/discord/simpleast/core/node/Node<",
|
||||
! "Lcom/discord/utilities/textprocessing/MessageRenderContext;",
|
||||
! ">;>;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
|
||||
- .line 1
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- const/4 v1, 0x1
|
||||
-
|
||||
- if-ne v0, v1, :cond_2
|
||||
-
|
||||
- iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- invoke-interface {v0}, Ljava/util/List;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eq v0, v1, :cond_0
|
||||
-
|
||||
- goto :goto_0
|
||||
-
|
||||
- :cond_0
|
||||
- const/4 v0, 0x0
|
||||
-
|
||||
- .line 2
|
||||
- invoke-static {p1, v0}, Lk0/i/f;->elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v1
|
||||
-
|
||||
- check-cast v1, Lcom/discord/simpleast/core/node/Node;
|
||||
-
|
||||
- .line 3
|
||||
- iget-object v2, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v0
|
||||
-
|
||||
- check-cast v0, Lcom/discord/models/domain/ModelMessageEmbed;
|
||||
-
|
||||
- .line 4
|
||||
- instance-of v1, v1, Lcom/discord/utilities/textprocessing/node/UrlNode;
|
||||
-
|
||||
- if-nez v1, :cond_1
|
||||
-
|
||||
- return-void
|
||||
-
|
||||
- .line 5
|
||||
- :cond_1
|
||||
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageEmbed;->isSimpleEmbed()Z
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- .line 6
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->clear()V
|
||||
-
|
||||
- :cond_2
|
||||
- :goto_0
|
||||
return-void
|
||||
.end method
|
||||
|
||||
--- 476,483 ----
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
|
@ -0,0 +1,91 @@
|
|||
diff -crB from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
|
||||
*** from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-09-13 11:49:34.217161804 +0100
|
||||
--- to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-09-13 11:52:23.983735280 +0100
|
||||
***************
|
||||
*** 476,552 ****
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Collection<",
|
||||
! "Lcom/discord/simpleast/core/node/Node<",
|
||||
! "Lcom/discord/utilities/textprocessing/MessageRenderContext;",
|
||||
! ">;>;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
|
||||
- .line 1
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- const/4 v1, 0x1
|
||||
-
|
||||
- if-ne v0, v1, :cond_2
|
||||
-
|
||||
- iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- invoke-interface {v0}, Ljava/util/List;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eq v0, v1, :cond_0
|
||||
-
|
||||
- goto :goto_0
|
||||
-
|
||||
- :cond_0
|
||||
- const/4 v0, 0x0
|
||||
-
|
||||
- .line 2
|
||||
- invoke-static {p1, v0}, Lk0/i/f;->elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v1
|
||||
-
|
||||
- check-cast v1, Lcom/discord/simpleast/core/node/Node;
|
||||
-
|
||||
- .line 3
|
||||
- iget-object v2, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v0
|
||||
-
|
||||
- check-cast v0, Lcom/discord/models/domain/ModelMessageEmbed;
|
||||
-
|
||||
- .line 4
|
||||
- instance-of v1, v1, Lcom/discord/utilities/textprocessing/node/UrlNode;
|
||||
-
|
||||
- if-nez v1, :cond_1
|
||||
-
|
||||
- return-void
|
||||
-
|
||||
- .line 5
|
||||
- :cond_1
|
||||
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageEmbed;->isSimpleEmbed()Z
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- .line 6
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->clear()V
|
||||
-
|
||||
- :cond_2
|
||||
- :goto_0
|
||||
return-void
|
||||
.end method
|
||||
|
||||
--- 476,483 ----
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
|
@ -0,0 +1,91 @@
|
|||
diff -crB from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
|
||||
*** from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-09-17 10:20:49.082537587 +0100
|
||||
--- to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-09-17 10:21:35.530677678 +0100
|
||||
***************
|
||||
*** 476,552 ****
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Collection<",
|
||||
! "Lcom/discord/simpleast/core/node/Node<",
|
||||
! "Lcom/discord/utilities/textprocessing/MessageRenderContext;",
|
||||
! ">;>;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
|
||||
- .line 1
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- const/4 v1, 0x1
|
||||
-
|
||||
- if-ne v0, v1, :cond_2
|
||||
-
|
||||
- iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- invoke-interface {v0}, Ljava/util/List;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eq v0, v1, :cond_0
|
||||
-
|
||||
- goto :goto_0
|
||||
-
|
||||
- :cond_0
|
||||
- const/4 v0, 0x0
|
||||
-
|
||||
- .line 2
|
||||
- invoke-static {p1, v0}, Lc0/i/f;->elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v1
|
||||
-
|
||||
- check-cast v1, Lcom/discord/simpleast/core/node/Node;
|
||||
-
|
||||
- .line 3
|
||||
- iget-object v2, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v0
|
||||
-
|
||||
- check-cast v0, Lcom/discord/models/domain/ModelMessageEmbed;
|
||||
-
|
||||
- .line 4
|
||||
- instance-of v1, v1, Lcom/discord/utilities/textprocessing/node/UrlNode;
|
||||
-
|
||||
- if-nez v1, :cond_1
|
||||
-
|
||||
- return-void
|
||||
-
|
||||
- .line 5
|
||||
- :cond_1
|
||||
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageEmbed;->isSimpleEmbed()Z
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- .line 6
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->clear()V
|
||||
-
|
||||
- :cond_2
|
||||
- :goto_0
|
||||
return-void
|
||||
.end method
|
||||
|
||||
--- 476,483 ----
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
|
@ -0,0 +1,91 @@
|
|||
diff -crB from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
|
||||
*** from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-09-17 10:20:49.082537587 +0100
|
||||
--- to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-09-17 10:21:35.530677678 +0100
|
||||
***************
|
||||
*** 476,552 ****
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Collection<",
|
||||
! "Lcom/discord/simpleast/core/node/Node<",
|
||||
! "Lcom/discord/utilities/textprocessing/MessageRenderContext;",
|
||||
! ">;>;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
|
||||
- .line 1
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- const/4 v1, 0x1
|
||||
-
|
||||
- if-ne v0, v1, :cond_2
|
||||
-
|
||||
- iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- invoke-interface {v0}, Ljava/util/List;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eq v0, v1, :cond_0
|
||||
-
|
||||
- goto :goto_0
|
||||
-
|
||||
- :cond_0
|
||||
- const/4 v0, 0x0
|
||||
-
|
||||
- .line 2
|
||||
- invoke-static {p1, v0}, Lc0/i/f;->elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v1
|
||||
-
|
||||
- check-cast v1, Lcom/discord/simpleast/core/node/Node;
|
||||
-
|
||||
- .line 3
|
||||
- iget-object v2, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v0
|
||||
-
|
||||
- check-cast v0, Lcom/discord/models/domain/ModelMessageEmbed;
|
||||
-
|
||||
- .line 4
|
||||
- instance-of v1, v1, Lcom/discord/utilities/textprocessing/node/UrlNode;
|
||||
-
|
||||
- if-nez v1, :cond_1
|
||||
-
|
||||
- return-void
|
||||
-
|
||||
- .line 5
|
||||
- :cond_1
|
||||
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageEmbed;->isSimpleEmbed()Z
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- .line 6
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->clear()V
|
||||
-
|
||||
- :cond_2
|
||||
- :goto_0
|
||||
return-void
|
||||
.end method
|
||||
|
||||
--- 476,483 ----
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
|
@ -0,0 +1,91 @@
|
|||
diff -crB from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
|
||||
*** from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-09-17 10:20:49.082537587 +0100
|
||||
--- to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-09-17 10:21:35.530677678 +0100
|
||||
***************
|
||||
*** 476,552 ****
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Collection<",
|
||||
! "Lcom/discord/simpleast/core/node/Node<",
|
||||
! "Lcom/discord/utilities/textprocessing/MessageRenderContext;",
|
||||
! ">;>;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
|
||||
- .line 1
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- const/4 v1, 0x1
|
||||
-
|
||||
- if-ne v0, v1, :cond_2
|
||||
-
|
||||
- iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- invoke-interface {v0}, Ljava/util/List;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eq v0, v1, :cond_0
|
||||
-
|
||||
- goto :goto_0
|
||||
-
|
||||
- :cond_0
|
||||
- const/4 v0, 0x0
|
||||
-
|
||||
- .line 2
|
||||
- invoke-static {p1, v0}, Lc0/i/f;->elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v1
|
||||
-
|
||||
- check-cast v1, Lcom/discord/simpleast/core/node/Node;
|
||||
-
|
||||
- .line 3
|
||||
- iget-object v2, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v0
|
||||
-
|
||||
- check-cast v0, Lcom/discord/models/domain/ModelMessageEmbed;
|
||||
-
|
||||
- .line 4
|
||||
- instance-of v1, v1, Lcom/discord/utilities/textprocessing/node/UrlNode;
|
||||
-
|
||||
- if-nez v1, :cond_1
|
||||
-
|
||||
- return-void
|
||||
-
|
||||
- .line 5
|
||||
- :cond_1
|
||||
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageEmbed;->isSimpleEmbed()Z
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- .line 6
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->clear()V
|
||||
-
|
||||
- :cond_2
|
||||
- :goto_0
|
||||
return-void
|
||||
.end method
|
||||
|
||||
--- 476,483 ----
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
|
@ -0,0 +1,91 @@
|
|||
diff -crB from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali
|
||||
*** from/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-09-17 10:20:49.082537587 +0100
|
||||
--- to/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali 2020-09-17 10:21:35.530677678 +0100
|
||||
***************
|
||||
*** 476,552 ****
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 3
|
||||
! .annotation system Ldalvik/annotation/Signature;
|
||||
! value = {
|
||||
! "(",
|
||||
! "Ljava/util/Collection<",
|
||||
! "Lcom/discord/simpleast/core/node/Node<",
|
||||
! "Lcom/discord/utilities/textprocessing/MessageRenderContext;",
|
||||
! ">;>;)V"
|
||||
! }
|
||||
! .end annotation
|
||||
|
||||
- .line 1
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- const/4 v1, 0x1
|
||||
-
|
||||
- if-ne v0, v1, :cond_2
|
||||
-
|
||||
- iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- invoke-interface {v0}, Ljava/util/List;->size()I
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eq v0, v1, :cond_0
|
||||
-
|
||||
- goto :goto_0
|
||||
-
|
||||
- :cond_0
|
||||
- const/4 v0, 0x0
|
||||
-
|
||||
- .line 2
|
||||
- invoke-static {p1, v0}, Lc0/i/f;->elementAt(Ljava/lang/Iterable;I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v1
|
||||
-
|
||||
- check-cast v1, Lcom/discord/simpleast/core/node/Node;
|
||||
-
|
||||
- .line 3
|
||||
- iget-object v2, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->embeds:Ljava/util/List;
|
||||
-
|
||||
- invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
|
||||
-
|
||||
- move-result-object v0
|
||||
-
|
||||
- check-cast v0, Lcom/discord/models/domain/ModelMessageEmbed;
|
||||
-
|
||||
- .line 4
|
||||
- instance-of v1, v1, Lcom/discord/utilities/textprocessing/node/UrlNode;
|
||||
-
|
||||
- if-nez v1, :cond_1
|
||||
-
|
||||
- return-void
|
||||
-
|
||||
- .line 5
|
||||
- :cond_1
|
||||
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessageEmbed;->isSimpleEmbed()Z
|
||||
-
|
||||
- move-result v0
|
||||
-
|
||||
- if-eqz v0, :cond_2
|
||||
-
|
||||
- .line 6
|
||||
- invoke-interface {p1}, Ljava/util/Collection;->clear()V
|
||||
-
|
||||
- :cond_2
|
||||
- :goto_0
|
||||
return-void
|
||||
.end method
|
||||
|
||||
--- 476,483 ----
|
||||
.end method
|
||||
|
||||
.method private final stripSimpleEmbedLink(Ljava/util/Collection;)V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
## DisTok CutTheCord: Embed Links
|
||||
|
||||
Bring back embed links when it's the only thing contained in the message.
|
||||
|
||||
|
||||
|
||||
to
|
||||
|
||||
|
||||
|
||||
#### Available and tested on:
|
||||
- 36.5
|
||||
- 38.0
|
||||
- 38.1
|
||||
- 40.04
|
||||
- 41.02
|
||||
- 41.05
|
||||
- 41.06
|
||||
- 41.10
|
||||
- 41.11
|
||||
- 42.0
|
||||
|
||||
|
|
@ -0,0 +1,143 @@
|
|||
diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-08-20 11:50:17.530000000 +0300
|
||||
--- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-08-20 13:20:05.790000000 +0300
|
||||
***************
|
||||
*** 81,110 ****
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
|
||||
.locals 1
|
||||
|
||||
! const-string v0, "meUser"
|
||||
|
||||
! .line 2
|
||||
! invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
!
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result p1
|
||||
!
|
||||
! if-nez p1, :cond_1
|
||||
!
|
||||
! if-eqz p2, :cond_0
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_0
|
||||
! const/4 p1, 0x0
|
||||
!
|
||||
! goto :goto_1
|
||||
!
|
||||
! :cond_1
|
||||
! :goto_0
|
||||
! const/4 p1, 0x1
|
||||
!
|
||||
! :goto_1
|
||||
! return p1
|
||||
.end method
|
||||
--- 81,87 ----
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
|
||||
.locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! return v0
|
||||
.end method
|
||||
diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/discord/stores/StoreExperiments.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments.smali 2020-08-20 11:50:17.540000000 +0300
|
||||
--- to/smali/com/discord/stores/StoreExperiments.smali 2020-08-20 13:20:05.790000000 +0300
|
||||
***************
|
||||
*** 1320,1377 ****
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 4
|
||||
|
||||
! .line 1
|
||||
! iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
|
||||
|
||||
! const/4 v1, 0x1
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! .line 2
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeUser:Lcom/discord/stores/StoreUser;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eq v0, v1, :cond_2
|
||||
!
|
||||
! .line 3
|
||||
! :cond_0
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeGuilds:Lcom/discord/stores/StoreGuilds;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! const-wide v2, 0x2bc056ab0800006L
|
||||
!
|
||||
! invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||
!
|
||||
! move-result-object v2
|
||||
!
|
||||
! invoke-interface {v0, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eqz v0, :cond_1
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_1
|
||||
! const/4 v1, 0x0
|
||||
!
|
||||
! :cond_2
|
||||
! :goto_0
|
||||
! return v1
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
--- 1320,1330 ----
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! return v0
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-08-20 11:50:18.650000000 +0300
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-08-20 13:20:05.790000000 +0300
|
||||
***************
|
||||
*** 87,97 ****
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
!
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result p4
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
--- 87,93 ----
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! const/4 p4, 0x1
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
Only in to/smali_classes2/com/discord/widgets/settings: WidgetSettings.smali.orig
|
||||
|
|
@ -0,0 +1,142 @@
|
|||
diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-08-27 13:05:45.520000000 +0300
|
||||
--- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-08-27 13:06:01.400000000 +0300
|
||||
***************
|
||||
*** 81,110 ****
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
|
||||
.locals 1
|
||||
|
||||
! const-string v0, "meUser"
|
||||
|
||||
! .line 2
|
||||
! invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
!
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result p1
|
||||
!
|
||||
! if-nez p1, :cond_1
|
||||
!
|
||||
! if-eqz p2, :cond_0
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_0
|
||||
! const/4 p1, 0x0
|
||||
!
|
||||
! goto :goto_1
|
||||
!
|
||||
! :cond_1
|
||||
! :goto_0
|
||||
! const/4 p1, 0x1
|
||||
!
|
||||
! :goto_1
|
||||
! return p1
|
||||
.end method
|
||||
--- 81,87 ----
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
|
||||
.locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! return v0
|
||||
.end method
|
||||
diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/discord/stores/StoreExperiments.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments.smali 2020-08-27 13:05:45.530000000 +0300
|
||||
--- to/smali/com/discord/stores/StoreExperiments.smali 2020-08-27 13:06:01.400000000 +0300
|
||||
***************
|
||||
*** 1395,1452 ****
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 4
|
||||
|
||||
! .line 1
|
||||
! iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
|
||||
|
||||
! const/4 v1, 0x1
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! .line 2
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeUser:Lcom/discord/stores/StoreUser;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eq v0, v1, :cond_2
|
||||
!
|
||||
! .line 3
|
||||
! :cond_0
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeGuilds:Lcom/discord/stores/StoreGuilds;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! const-wide v2, 0x2bc056ab0800006L
|
||||
!
|
||||
! invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||
!
|
||||
! move-result-object v2
|
||||
!
|
||||
! invoke-interface {v0, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eqz v0, :cond_1
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_1
|
||||
! const/4 v1, 0x0
|
||||
!
|
||||
! :cond_2
|
||||
! :goto_0
|
||||
! return v1
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
--- 1395,1405 ----
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! return v0
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-08-27 13:05:47.180000000 +0300
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-08-27 13:06:01.400000000 +0300
|
||||
***************
|
||||
*** 87,97 ****
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
!
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result p4
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
--- 87,93 ----
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! const/4 p4, 0x1
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
|
|
@ -0,0 +1,154 @@
|
|||
diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-09-07 10:44:49.047502397 +0100
|
||||
--- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-09-07 11:11:44.645607451 +0100
|
||||
***************
|
||||
*** 65,100 ****
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
|
||||
.locals 1
|
||||
|
||||
! const-string v0, "meUser"
|
||||
|
||||
! .line 2
|
||||
! invoke-static {p1, v0}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
|
||||
! move-result p1
|
||||
!
|
||||
! if-nez p1, :cond_1
|
||||
!
|
||||
! if-eqz p2, :cond_0
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_0
|
||||
! const/4 p1, 0x0
|
||||
!
|
||||
! goto :goto_1
|
||||
!
|
||||
! :cond_1
|
||||
! :goto_0
|
||||
! const/4 p1, 0x1
|
||||
!
|
||||
! :goto_1
|
||||
! invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
|
||||
!
|
||||
! move-result-object p1
|
||||
!
|
||||
! return-object p1
|
||||
.end method
|
||||
|
||||
.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
||||
--- 65,77 ----
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
|
||||
.locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
|
||||
|
||||
! move-result-object v0
|
||||
|
||||
! return-object v0
|
||||
.end method
|
||||
|
||||
.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
||||
diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/discord/stores/StoreExperiments.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments.smali 2020-09-07 10:44:49.055502331 +0100
|
||||
--- to/smali/com/discord/stores/StoreExperiments.smali 2020-09-07 11:05:39.577136011 +0100
|
||||
***************
|
||||
*** 1333,1390 ****
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 4
|
||||
|
||||
! .line 1
|
||||
! iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
|
||||
|
||||
! const/4 v1, 0x1
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! .line 2
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeUser:Lcom/discord/stores/StoreUser;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eq v0, v1, :cond_2
|
||||
!
|
||||
! .line 3
|
||||
! :cond_0
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeGuilds:Lcom/discord/stores/StoreGuilds;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! const-wide v2, 0x2bc056ab0800006L
|
||||
!
|
||||
! invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||
!
|
||||
! move-result-object v2
|
||||
!
|
||||
! invoke-interface {v0, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eqz v0, :cond_1
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_1
|
||||
! const/4 v1, 0x0
|
||||
!
|
||||
! :cond_2
|
||||
! :goto_0
|
||||
! return v1
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
--- 1333,1343 ----
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! return v0
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
diff -crB from/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali to/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
|
||||
*** from/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-09-07 10:44:49.759496450 +0100
|
||||
--- to/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-09-07 11:05:39.577136011 +0100
|
||||
***************
|
||||
*** 92,102 ****
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! invoke-static {p1, v1}, Lk0/o/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
!
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result p4
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
--- 92,98 ----
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! const/4 p4, 0x1
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
|
|
@ -0,0 +1,142 @@
|
|||
diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-09-08 10:40:46.333462019 +0100
|
||||
--- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-09-08 10:42:11.492022125 +0100
|
||||
***************
|
||||
*** 81,110 ****
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
|
||||
.locals 1
|
||||
|
||||
! const-string v0, "meUser"
|
||||
|
||||
! .line 2
|
||||
! invoke-static {p1, v0}, Lk0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
!
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result p1
|
||||
!
|
||||
! if-nez p1, :cond_1
|
||||
!
|
||||
! if-eqz p2, :cond_0
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_0
|
||||
! const/4 p1, 0x0
|
||||
!
|
||||
! goto :goto_1
|
||||
!
|
||||
! :cond_1
|
||||
! :goto_0
|
||||
! const/4 p1, 0x1
|
||||
!
|
||||
! :goto_1
|
||||
! return p1
|
||||
.end method
|
||||
--- 81,87 ----
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
|
||||
.locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! return v0
|
||||
.end method
|
||||
diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/discord/stores/StoreExperiments.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments.smali 2020-09-08 10:40:46.335462032 +0100
|
||||
--- to/smali/com/discord/stores/StoreExperiments.smali 2020-09-08 10:41:44.891847170 +0100
|
||||
***************
|
||||
*** 1395,1452 ****
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 4
|
||||
|
||||
! .line 1
|
||||
! iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
|
||||
|
||||
! const/4 v1, 0x1
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! .line 2
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeUser:Lcom/discord/stores/StoreUser;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eq v0, v1, :cond_2
|
||||
!
|
||||
! .line 3
|
||||
! :cond_0
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeGuilds:Lcom/discord/stores/StoreGuilds;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! const-wide v2, 0x2bc056ab0800006L
|
||||
!
|
||||
! invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||
!
|
||||
! move-result-object v2
|
||||
!
|
||||
! invoke-interface {v0, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eqz v0, :cond_1
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_1
|
||||
! const/4 v1, 0x0
|
||||
!
|
||||
! :cond_2
|
||||
! :goto_0
|
||||
! return v1
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
--- 1395,1405 ----
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! return v0
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-09-08 10:40:47.309468439 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-09-08 10:42:38.740201342 +0100
|
||||
***************
|
||||
*** 87,97 ****
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! invoke-static {p1, v1}, Lk0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
!
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result p4
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
--- 87,93 ----
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! const/4 p4, 0x1
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
|
|
@ -0,0 +1,154 @@
|
|||
diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-09-13 11:49:34.075156179 +0100
|
||||
--- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-09-13 11:53:38.177052321 +0100
|
||||
***************
|
||||
*** 65,100 ****
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
|
||||
.locals 1
|
||||
|
||||
! const-string v0, "meUser"
|
||||
|
||||
! .line 2
|
||||
! invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
|
||||
! move-result p1
|
||||
!
|
||||
! if-nez p1, :cond_1
|
||||
!
|
||||
! if-eqz p2, :cond_0
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_0
|
||||
! const/4 p1, 0x0
|
||||
!
|
||||
! goto :goto_1
|
||||
!
|
||||
! :cond_1
|
||||
! :goto_0
|
||||
! const/4 p1, 0x1
|
||||
!
|
||||
! :goto_1
|
||||
! invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
|
||||
!
|
||||
! move-result-object p1
|
||||
!
|
||||
! return-object p1
|
||||
.end method
|
||||
|
||||
.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
||||
--- 65,77 ----
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
|
||||
.locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
|
||||
|
||||
! move-result-object v0
|
||||
|
||||
! return-object v0
|
||||
.end method
|
||||
|
||||
.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
||||
diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/discord/stores/StoreExperiments.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments.smali 2020-09-13 11:49:34.077156258 +0100
|
||||
--- to/smali/com/discord/stores/StoreExperiments.smali 2020-09-13 11:52:45.481335978 +0100
|
||||
***************
|
||||
*** 1418,1475 ****
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 4
|
||||
|
||||
! .line 1
|
||||
! iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
|
||||
|
||||
! const/4 v1, 0x1
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! .line 2
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeUser:Lcom/discord/stores/StoreUser;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eq v0, v1, :cond_2
|
||||
!
|
||||
! .line 3
|
||||
! :cond_0
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeGuilds:Lcom/discord/stores/StoreGuilds;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! const-wide v2, 0x2bc056ab0800006L
|
||||
!
|
||||
! invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||
!
|
||||
! move-result-object v2
|
||||
!
|
||||
! invoke-interface {v0, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eqz v0, :cond_1
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_1
|
||||
! const/4 v1, 0x0
|
||||
!
|
||||
! :cond_2
|
||||
! :goto_0
|
||||
! return v1
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
--- 1418,1428 ----
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! return v0
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-09-13 11:49:34.921189685 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-09-13 11:54:09.051091362 +0100
|
||||
***************
|
||||
*** 92,102 ****
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! invoke-static {p1, v1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
!
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result p4
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
--- 92,98 ----
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! const/4 p4, 0x1
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
|
|
@ -0,0 +1,154 @@
|
|||
diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-09-15 09:41:31.290836830 +0100
|
||||
--- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-09-15 09:41:41.586854046 +0100
|
||||
***************
|
||||
*** 65,100 ****
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
|
||||
.locals 1
|
||||
|
||||
! const-string v0, "meUser"
|
||||
|
||||
! .line 2
|
||||
! invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
|
||||
! move-result p1
|
||||
!
|
||||
! if-nez p1, :cond_1
|
||||
!
|
||||
! if-eqz p2, :cond_0
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_0
|
||||
! const/4 p1, 0x0
|
||||
!
|
||||
! goto :goto_1
|
||||
!
|
||||
! :cond_1
|
||||
! :goto_0
|
||||
! const/4 p1, 0x1
|
||||
!
|
||||
! :goto_1
|
||||
! invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
|
||||
!
|
||||
! move-result-object p1
|
||||
!
|
||||
! return-object p1
|
||||
.end method
|
||||
|
||||
.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
||||
--- 65,77 ----
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
|
||||
.locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
|
||||
|
||||
! move-result-object v0
|
||||
|
||||
! return-object v0
|
||||
.end method
|
||||
|
||||
.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
||||
diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/discord/stores/StoreExperiments.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments.smali 2020-09-15 09:41:31.300836846 +0100
|
||||
--- to/smali/com/discord/stores/StoreExperiments.smali 2020-09-15 09:41:41.586854046 +0100
|
||||
***************
|
||||
*** 1763,1820 ****
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 4
|
||||
|
||||
! .line 1
|
||||
! iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
|
||||
|
||||
! const/4 v1, 0x1
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! .line 2
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeUser:Lcom/discord/stores/StoreUser;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eq v0, v1, :cond_2
|
||||
!
|
||||
! .line 3
|
||||
! :cond_0
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeGuilds:Lcom/discord/stores/StoreGuilds;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! const-wide v2, 0x2bc056ab0800006L
|
||||
!
|
||||
! invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||
!
|
||||
! move-result-object v2
|
||||
!
|
||||
! invoke-interface {v0, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eqz v0, :cond_1
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_1
|
||||
! const/4 v1, 0x0
|
||||
!
|
||||
! :cond_2
|
||||
! :goto_0
|
||||
! return v1
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
--- 1763,1773 ----
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! return v0
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-09-15 09:41:32.132838240 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-09-15 09:41:41.586854046 +0100
|
||||
***************
|
||||
*** 92,102 ****
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! invoke-static {p1, v1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
!
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result p4
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
--- 92,98 ----
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! const/4 p4, 0x1
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
|
|
@ -0,0 +1,154 @@
|
|||
diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-09-15 09:41:31.290836830 +0100
|
||||
--- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-09-15 09:41:41.586854046 +0100
|
||||
***************
|
||||
*** 65,100 ****
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
|
||||
.locals 1
|
||||
|
||||
! const-string v0, "meUser"
|
||||
|
||||
! .line 2
|
||||
! invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
|
||||
! move-result p1
|
||||
!
|
||||
! if-nez p1, :cond_1
|
||||
!
|
||||
! if-eqz p2, :cond_0
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_0
|
||||
! const/4 p1, 0x0
|
||||
!
|
||||
! goto :goto_1
|
||||
!
|
||||
! :cond_1
|
||||
! :goto_0
|
||||
! const/4 p1, 0x1
|
||||
!
|
||||
! :goto_1
|
||||
! invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
|
||||
!
|
||||
! move-result-object p1
|
||||
!
|
||||
! return-object p1
|
||||
.end method
|
||||
|
||||
.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
||||
--- 65,77 ----
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
|
||||
.locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
|
||||
|
||||
! move-result-object v0
|
||||
|
||||
! return-object v0
|
||||
.end method
|
||||
|
||||
.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
||||
diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/discord/stores/StoreExperiments.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments.smali 2020-09-15 09:41:31.300836846 +0100
|
||||
--- to/smali/com/discord/stores/StoreExperiments.smali 2020-09-15 09:41:41.586854046 +0100
|
||||
***************
|
||||
*** 1763,1820 ****
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 4
|
||||
|
||||
! .line 1
|
||||
! iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
|
||||
|
||||
! const/4 v1, 0x1
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! .line 2
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeUser:Lcom/discord/stores/StoreUser;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eq v0, v1, :cond_2
|
||||
!
|
||||
! .line 3
|
||||
! :cond_0
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeGuilds:Lcom/discord/stores/StoreGuilds;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! const-wide v2, 0x2bc056ab0800006L
|
||||
!
|
||||
! invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||
!
|
||||
! move-result-object v2
|
||||
!
|
||||
! invoke-interface {v0, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eqz v0, :cond_1
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_1
|
||||
! const/4 v1, 0x0
|
||||
!
|
||||
! :cond_2
|
||||
! :goto_0
|
||||
! return v1
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
--- 1763,1773 ----
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! return v0
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-09-15 09:41:32.132838240 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-09-15 09:41:41.586854046 +0100
|
||||
***************
|
||||
*** 92,102 ****
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! invoke-static {p1, v1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
!
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result p4
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
--- 92,98 ----
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! const/4 p4, 0x1
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
|
|
@ -0,0 +1,154 @@
|
|||
diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-09-17 10:20:48.910537067 +0100
|
||||
--- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-09-17 10:22:32.538849662 +0100
|
||||
***************
|
||||
*** 65,100 ****
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
|
||||
.locals 1
|
||||
|
||||
! const-string v0, "meUser"
|
||||
|
||||
! .line 2
|
||||
! invoke-static {p1, v0}, Lc0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
|
||||
! move-result p1
|
||||
!
|
||||
! if-nez p1, :cond_1
|
||||
!
|
||||
! if-eqz p2, :cond_0
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_0
|
||||
! const/4 p1, 0x0
|
||||
!
|
||||
! goto :goto_1
|
||||
!
|
||||
! :cond_1
|
||||
! :goto_0
|
||||
! const/4 p1, 0x1
|
||||
!
|
||||
! :goto_1
|
||||
! invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
|
||||
!
|
||||
! move-result-object p1
|
||||
!
|
||||
! return-object p1
|
||||
.end method
|
||||
|
||||
.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
||||
--- 65,77 ----
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
|
||||
.locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
|
||||
|
||||
! move-result-object v0
|
||||
|
||||
! return-object v0
|
||||
.end method
|
||||
|
||||
.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
||||
diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/discord/stores/StoreExperiments.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments.smali 2020-09-17 10:20:48.914537080 +0100
|
||||
--- to/smali/com/discord/stores/StoreExperiments.smali 2020-09-17 10:21:56.060739605 +0100
|
||||
***************
|
||||
*** 1785,1842 ****
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 4
|
||||
|
||||
! .line 1
|
||||
! iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
|
||||
|
||||
! const/4 v1, 0x1
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! .line 2
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeUser:Lcom/discord/stores/StoreUser;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eq v0, v1, :cond_2
|
||||
!
|
||||
! .line 3
|
||||
! :cond_0
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeGuilds:Lcom/discord/stores/StoreGuilds;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! const-wide v2, 0x2bc056ab0800006L
|
||||
!
|
||||
! invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||
!
|
||||
! move-result-object v2
|
||||
!
|
||||
! invoke-interface {v0, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eqz v0, :cond_1
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_1
|
||||
! const/4 v1, 0x0
|
||||
!
|
||||
! :cond_2
|
||||
! :goto_0
|
||||
! return v1
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
--- 1785,1795 ----
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! return v0
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-09-17 10:20:49.680539389 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-09-17 10:23:04.564946284 +0100
|
||||
***************
|
||||
*** 92,102 ****
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! invoke-static {p1, v1}, Lc0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
!
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result p4
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
--- 92,98 ----
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! const/4 p4, 0x1
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
|
|
@ -0,0 +1,154 @@
|
|||
diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-09-23 12:13:30.960701788 +0100
|
||||
--- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-09-23 12:16:02.082646735 +0100
|
||||
***************
|
||||
*** 65,100 ****
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
|
||||
.locals 1
|
||||
|
||||
! const-string v0, "meUser"
|
||||
|
||||
! .line 2
|
||||
! invoke-static {p1, v0}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
|
||||
! move-result p1
|
||||
!
|
||||
! if-nez p1, :cond_1
|
||||
!
|
||||
! if-eqz p2, :cond_0
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_0
|
||||
! const/4 p1, 0x0
|
||||
!
|
||||
! goto :goto_1
|
||||
!
|
||||
! :cond_1
|
||||
! :goto_0
|
||||
! const/4 p1, 0x1
|
||||
!
|
||||
! :goto_1
|
||||
! invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
|
||||
!
|
||||
! move-result-object p1
|
||||
!
|
||||
! return-object p1
|
||||
.end method
|
||||
|
||||
.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
||||
--- 65,77 ----
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
|
||||
.locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
|
||||
|
||||
! move-result-object v0
|
||||
|
||||
! return-object v0
|
||||
.end method
|
||||
|
||||
.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
||||
diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/discord/stores/StoreExperiments.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments.smali 2020-09-23 12:13:30.964701787 +0100
|
||||
--- to/smali/com/discord/stores/StoreExperiments.smali 2020-09-23 12:15:27.378663881 +0100
|
||||
***************
|
||||
*** 1784,1841 ****
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 4
|
||||
|
||||
! .line 1
|
||||
! iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
|
||||
|
||||
! const/4 v1, 0x1
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! .line 2
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeUser:Lcom/discord/stores/StoreUser;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eq v0, v1, :cond_2
|
||||
!
|
||||
! .line 3
|
||||
! :cond_0
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeGuilds:Lcom/discord/stores/StoreGuilds;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! const-wide v2, 0x2bc056ab0800006L
|
||||
!
|
||||
! invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||
!
|
||||
! move-result-object v2
|
||||
!
|
||||
! invoke-interface {v0, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eqz v0, :cond_1
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_1
|
||||
! const/4 v1, 0x0
|
||||
!
|
||||
! :cond_2
|
||||
! :goto_0
|
||||
! return v1
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
--- 1784,1794 ----
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! return v0
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-09-23 12:13:31.892701616 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-09-23 12:16:32.244629902 +0100
|
||||
***************
|
||||
*** 92,102 ****
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! invoke-static {p1, v1}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
!
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result p4
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
--- 92,98 ----
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! const/4 p4, 0x1
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
|
|
@ -0,0 +1,154 @@
|
|||
diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-09-23 12:13:30.960701788 +0100
|
||||
--- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-09-23 12:16:02.082646735 +0100
|
||||
***************
|
||||
*** 65,100 ****
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
|
||||
.locals 1
|
||||
|
||||
! const-string v0, "meUser"
|
||||
|
||||
! .line 2
|
||||
! invoke-static {p1, v0}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
|
||||
! move-result p1
|
||||
!
|
||||
! if-nez p1, :cond_1
|
||||
!
|
||||
! if-eqz p2, :cond_0
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_0
|
||||
! const/4 p1, 0x0
|
||||
!
|
||||
! goto :goto_1
|
||||
!
|
||||
! :cond_1
|
||||
! :goto_0
|
||||
! const/4 p1, 0x1
|
||||
!
|
||||
! :goto_1
|
||||
! invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
|
||||
!
|
||||
! move-result-object p1
|
||||
!
|
||||
! return-object p1
|
||||
.end method
|
||||
|
||||
.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
||||
--- 65,77 ----
|
||||
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Ljava/lang/Boolean;
|
||||
.locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
|
||||
|
||||
! move-result-object v0
|
||||
|
||||
! return-object v0
|
||||
.end method
|
||||
|
||||
.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
|
||||
diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/discord/stores/StoreExperiments.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments.smali 2020-09-23 12:13:30.964701787 +0100
|
||||
--- to/smali/com/discord/stores/StoreExperiments.smali 2020-09-23 12:15:27.378663881 +0100
|
||||
***************
|
||||
*** 1784,1841 ****
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 4
|
||||
|
||||
! .line 1
|
||||
! iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
|
||||
|
||||
! const/4 v1, 0x1
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! .line 2
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeUser:Lcom/discord/stores/StoreUser;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eq v0, v1, :cond_2
|
||||
!
|
||||
! .line 3
|
||||
! :cond_0
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeGuilds:Lcom/discord/stores/StoreGuilds;
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! const-wide v2, 0x2bc056ab0800006L
|
||||
!
|
||||
! invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||
!
|
||||
! move-result-object v2
|
||||
!
|
||||
! invoke-interface {v0, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eqz v0, :cond_1
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_1
|
||||
! const/4 v1, 0x0
|
||||
!
|
||||
! :cond_2
|
||||
! :goto_0
|
||||
! return v1
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
--- 1784,1794 ----
|
||||
.end method
|
||||
|
||||
.method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
|
||||
! .locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! return v0
|
||||
.end method
|
||||
|
||||
.method public final isInitialized()Lrx/Observable;
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-09-23 12:13:31.892701616 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-09-23 12:16:32.244629902 +0100
|
||||
***************
|
||||
*** 92,102 ****
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! invoke-static {p1, v1}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
!
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result p4
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
--- 92,98 ----
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! const/4 p4, 0x1
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
|
|
@ -0,0 +1,101 @@
|
|||
diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
|
||||
*** from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-09-29 13:35:45.148856490 +0100
|
||||
--- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2020-09-29 13:37:38.701748747 +0100
|
||||
***************
|
||||
*** 61,122 ****
|
||||
.end method
|
||||
|
||||
.method public final invoke()Z
|
||||
! .locals 4
|
||||
|
||||
! .line 2
|
||||
! iget-object v0, p0, Lcom/discord/stores/StoreExperiments$getExperimentalAlpha$1;->this$0:Lcom/discord/stores/StoreExperiments;
|
||||
|
||||
! invoke-static {v0}, Lcom/discord/stores/StoreExperiments;->access$getStoreUser$p(Lcom/discord/stores/StoreExperiments;)Lcom/discord/stores/StoreUser;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
|
||||
!
|
||||
! move-result-object v0
|
||||
!
|
||||
! .line 3
|
||||
! iget-object v1, p0, Lcom/discord/stores/StoreExperiments$getExperimentalAlpha$1;->this$0:Lcom/discord/stores/StoreExperiments;
|
||||
!
|
||||
! invoke-static {v1}, Lcom/discord/stores/StoreExperiments;->access$getStoreGuilds$p(Lcom/discord/stores/StoreExperiments;)Lcom/discord/stores/StoreGuilds;
|
||||
!
|
||||
! move-result-object v1
|
||||
!
|
||||
! invoke-virtual {v1}, Lcom/discord/stores/StoreGuilds;->getGuilds()Ljava/util/Map;
|
||||
!
|
||||
! move-result-object v1
|
||||
!
|
||||
! const-wide v2, 0x2bc056ab0800006L
|
||||
!
|
||||
! invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
|
||||
!
|
||||
! move-result-object v2
|
||||
!
|
||||
! invoke-interface {v1, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
|
||||
!
|
||||
! move-result-object v1
|
||||
!
|
||||
! check-cast v1, Lcom/discord/models/domain/ModelGuild;
|
||||
!
|
||||
! const/4 v2, 0x1
|
||||
!
|
||||
! if-eqz v0, :cond_0
|
||||
!
|
||||
! .line 4
|
||||
! invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result v0
|
||||
!
|
||||
! if-eq v0, v2, :cond_2
|
||||
!
|
||||
! :cond_0
|
||||
! if-eqz v1, :cond_1
|
||||
!
|
||||
! goto :goto_0
|
||||
!
|
||||
! :cond_1
|
||||
! const/4 v2, 0x0
|
||||
!
|
||||
! :cond_2
|
||||
! :goto_0
|
||||
! return v2
|
||||
.end method
|
||||
--- 61,69 ----
|
||||
.end method
|
||||
|
||||
.method public final invoke()Z
|
||||
! .locals 1
|
||||
|
||||
! const/4 v0, 0x1
|
||||
|
||||
! return v0
|
||||
.end method
|
||||
diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
|
||||
*** from/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-09-29 13:35:46.367017476 +0100
|
||||
--- to/smali_classes2/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2020-09-29 13:36:18.829383860 +0100
|
||||
***************
|
||||
*** 92,102 ****
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! invoke-static {p1, v1}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
!
|
||||
! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
|
||||
!
|
||||
! move-result p4
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
--- 92,98 ----
|
||||
|
||||
if-nez p4, :cond_1
|
||||
|
||||
! const/4 p4, 0x1
|
||||
|
||||
if-eqz p4, :cond_0
|
||||
|
||||
|
|
@ -183,4 +183,14 @@ This patch enables developer options (empty), mobile experiments (of which there
|
|||
- 34.3
|
||||
- 35.0-alpha1
|
||||
- 36.3
|
||||
- 36.5
|
||||
- 38.0
|
||||
- 38.1
|
||||
- 40.04
|
||||
- 41.02
|
||||
- 41.05
|
||||
- 41.06
|
||||
- 41.10
|
||||
- 41.11
|
||||
- 42.0
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
Only in com.discord: build
|
||||
Only in com.discord: dist
|
||||
diff --color -crB com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali
|
||||
*** com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-30 01:52:32.303011366 +0300
|
||||
--- com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-31 15:28:48.386493702 +0300
|
||||
***************
|
||||
*** 154,159 ****
|
||||
--- 154,165 ----
|
||||
|
||||
if-eqz v4, :cond_2
|
||||
|
||||
+ invoke-interface {v1}, Lcom/discord/models/domain/emoji/Emoji;->isUsable()Z
|
||||
+
|
||||
+ move-result v4
|
||||
+
|
||||
+ if-eqz v4, :cond_2
|
||||
+
|
||||
.line 5
|
||||
new-instance v2, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
Only in com.discord: build
|
||||
Only in com.discord: dist
|
||||
diff --color -crB com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali
|
||||
*** com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-30 01:52:32.303011366 +0300
|
||||
--- com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-31 15:28:48.386493702 +0300
|
||||
***************
|
||||
*** 154,159 ****
|
||||
--- 154,165 ----
|
||||
|
||||
if-eqz v4, :cond_2
|
||||
|
||||
+ invoke-interface {v1}, Lcom/discord/models/domain/emoji/Emoji;->isUsable()Z
|
||||
+
|
||||
+ move-result v4
|
||||
+
|
||||
+ if-eqz v4, :cond_2
|
||||
+
|
||||
.line 5
|
||||
new-instance v2, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
Only in com.discord: build
|
||||
Only in com.discord: dist
|
||||
diff --color -crB com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali
|
||||
*** com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-30 01:52:32.303011366 +0300
|
||||
--- com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-31 15:28:48.386493702 +0300
|
||||
***************
|
||||
*** 154,159 ****
|
||||
--- 154,165 ----
|
||||
|
||||
if-eqz v4, :cond_2
|
||||
|
||||
+ invoke-interface {v1}, Lcom/discord/models/domain/emoji/Emoji;->isUsable()Z
|
||||
+
|
||||
+ move-result v4
|
||||
+
|
||||
+ if-eqz v4, :cond_2
|
||||
+
|
||||
.line 5
|
||||
new-instance v2, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
Only in com.discord: build
|
||||
Only in com.discord: dist
|
||||
diff --color -crB com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali
|
||||
*** com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-30 01:52:32.303011366 +0300
|
||||
--- com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-31 15:28:48.386493702 +0300
|
||||
***************
|
||||
*** 154,159 ****
|
||||
--- 154,165 ----
|
||||
|
||||
if-eqz v4, :cond_2
|
||||
|
||||
+ invoke-interface {v1}, Lcom/discord/models/domain/emoji/Emoji;->isUsable()Z
|
||||
+
|
||||
+ move-result v4
|
||||
+
|
||||
+ if-eqz v4, :cond_2
|
||||
+
|
||||
.line 5
|
||||
new-instance v2, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
Only in com.discord: build
|
||||
Only in com.discord: dist
|
||||
diff --color -crB com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali
|
||||
*** com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-30 01:52:32.303011366 +0300
|
||||
--- com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-31 15:28:48.386493702 +0300
|
||||
***************
|
||||
*** 154,159 ****
|
||||
--- 154,165 ----
|
||||
|
||||
if-eqz v4, :cond_2
|
||||
|
||||
+ invoke-interface {v1}, Lcom/discord/models/domain/emoji/Emoji;->isUsable()Z
|
||||
+
|
||||
+ move-result v4
|
||||
+
|
||||
+ if-eqz v4, :cond_2
|
||||
+
|
||||
.line 5
|
||||
new-instance v2, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
Only in com.discord: build
|
||||
Only in com.discord: dist
|
||||
diff --color -crB com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali
|
||||
*** com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-30 01:52:32.303011366 +0300
|
||||
--- com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-31 15:28:48.386493702 +0300
|
||||
***************
|
||||
*** 154,159 ****
|
||||
--- 154,165 ----
|
||||
|
||||
if-eqz v4, :cond_2
|
||||
|
||||
+ invoke-interface {v1}, Lcom/discord/models/domain/emoji/Emoji;->isUsable()Z
|
||||
+
|
||||
+ move-result v4
|
||||
+
|
||||
+ if-eqz v4, :cond_2
|
||||
+
|
||||
.line 5
|
||||
new-instance v2, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
Only in com.discord: build
|
||||
Only in com.discord: dist
|
||||
diff --color -crB com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali
|
||||
*** com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-30 01:52:32.303011366 +0300
|
||||
--- com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-31 15:28:48.386493702 +0300
|
||||
***************
|
||||
*** 154,159 ****
|
||||
--- 154,165 ----
|
||||
|
||||
if-eqz v4, :cond_2
|
||||
|
||||
+ invoke-interface {v1}, Lcom/discord/models/domain/emoji/Emoji;->isUsable()Z
|
||||
+
|
||||
+ move-result v4
|
||||
+
|
||||
+ if-eqz v4, :cond_2
|
||||
+
|
||||
.line 5
|
||||
new-instance v2, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
Only in com.discord: build
|
||||
Only in com.discord: dist
|
||||
diff --color -crB com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali
|
||||
*** com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-30 01:52:32.303011366 +0300
|
||||
--- com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-31 15:28:48.386493702 +0300
|
||||
***************
|
||||
*** 154,159 ****
|
||||
--- 154,165 ----
|
||||
|
||||
if-eqz v4, :cond_2
|
||||
|
||||
+ invoke-interface {v1}, Lcom/discord/models/domain/emoji/Emoji;->isUsable()Z
|
||||
+
|
||||
+ move-result v4
|
||||
+
|
||||
+ if-eqz v4, :cond_2
|
||||
+
|
||||
.line 5
|
||||
new-instance v2, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
Only in com.discord: build
|
||||
Only in com.discord: dist
|
||||
diff --color -crB com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali
|
||||
*** com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-30 01:52:32.303011366 +0300
|
||||
--- com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-31 15:28:48.386493702 +0300
|
||||
***************
|
||||
*** 154,159 ****
|
||||
--- 154,165 ----
|
||||
|
||||
if-eqz v4, :cond_2
|
||||
|
||||
+ invoke-interface {v1}, Lcom/discord/models/domain/emoji/Emoji;->isUsable()Z
|
||||
+
|
||||
+ move-result v4
|
||||
+
|
||||
+ if-eqz v4, :cond_2
|
||||
+
|
||||
.line 5
|
||||
new-instance v2, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
Only in com.discord: build
|
||||
Only in com.discord: dist
|
||||
diff --color -crB com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali
|
||||
*** com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-30 01:52:32.303011366 +0300
|
||||
--- com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-31 15:28:48.386493702 +0300
|
||||
***************
|
||||
*** 154,159 ****
|
||||
--- 154,165 ----
|
||||
|
||||
if-eqz v4, :cond_2
|
||||
|
||||
+ invoke-interface {v1}, Lcom/discord/models/domain/emoji/Emoji;->isUsable()Z
|
||||
+
|
||||
+ move-result v4
|
||||
+
|
||||
+ if-eqz v4, :cond_2
|
||||
+
|
||||
.line 5
|
||||
new-instance v2, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
Only in com.discord: build
|
||||
Only in com.discord: dist
|
||||
diff --color -crB com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali
|
||||
*** com.discord-base/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-30 01:52:32.303011366 +0300
|
||||
--- com.discord/smali/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion.smali 2020-07-31 15:28:48.386493702 +0300
|
||||
***************
|
||||
*** 154,159 ****
|
||||
--- 154,165 ----
|
||||
|
||||
if-eqz v4, :cond_2
|
||||
|
||||
+ invoke-interface {v1}, Lcom/discord/models/domain/emoji/Emoji;->isUsable()Z
|
||||
+
|
||||
+ move-result v4
|
||||
+
|
||||
+ if-eqz v4, :cond_2
|
||||
+
|
||||
.line 5
|
||||
new-instance v2, Lcom/discord/widgets/chat/input/emoji/WidgetEmojiAdapter$EmojiItem;
|
||||
|
||||
|
||||
|
|
@ -14,4 +14,14 @@ Big thanks to [@BlueMods](https://gitdab.com/BlueMods) for sending in this patch
|
|||
- 34.3
|
||||
- 35.0-alpha1
|
||||
- 36.3
|
||||
- 36.5
|
||||
- 38.0
|
||||
- 38.1
|
||||
- 40.04
|
||||
- 41.02
|
||||
- 41.05
|
||||
- 41.06
|
||||
- 41.10
|
||||
- 41.11
|
||||
- 42.0
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue