diff --git a/com.discord/AndroidManifest.xml b/com.discord/AndroidManifest.xml index be636760c2..0426f3be86 100644 --- a/com.discord/AndroidManifest.xml +++ b/com.discord/AndroidManifest.xml @@ -23,7 +23,6 @@ - @@ -164,6 +163,11 @@ + + + + + @@ -171,20 +175,15 @@ + - + - - - - - - - + @@ -250,12 +249,12 @@ + - diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index bf9b8e3012..d11b3bbc64 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1307.apk +apkFileName: com.discord-1308.apk compressionType: false doNotCompress: - resources.arsc @@ -61,7 +61,6 @@ unknownFiles: play-services-stats.properties: '8' play-services-tagmanager-v4-impl.properties: '8' play-services-tasks.properties: '8' - protolite-well-known-types.properties: '8' transport-api.properties: '8' transport-backend-cct.properties: '8' transport-runtime.properties: '8' @@ -82,5 +81,5 @@ usesFramework: tag: null version: 2.4.2-83a459-SNAPSHOT versionInfo: - versionCode: '1307' - versionName: '48.1' + versionCode: '1308' + versionName: '47.1' diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 03f936f5a3..1a58a3a24e 100644 Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ diff --git a/com.discord/res/drawable-anydpi-v24/ic_edit_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_edit_24dp.xml new file mode 100644 index 0000000000..70424007b9 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_edit_24dp.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_remove_reaction_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_remove_reaction_24dp.xml new file mode 100644 index 0000000000..71ae8d4913 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_remove_reaction_24dp.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-hdpi/ic_edit_24dp.png b/com.discord/res/drawable-hdpi/ic_edit_24dp.png new file mode 100644 index 0000000000..a9d47643de Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_edit_24dp.png differ diff --git a/com.discord/res/drawable-hdpi/ic_remove_reaction_24dp.png b/com.discord/res/drawable-hdpi/ic_remove_reaction_24dp.png new file mode 100644 index 0000000000..c551d2b216 Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_remove_reaction_24dp.png differ diff --git a/com.discord/res/drawable-ldpi/ic_edit_24dp.png b/com.discord/res/drawable-ldpi/ic_edit_24dp.png new file mode 100644 index 0000000000..0d856aebd0 Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_edit_24dp.png differ diff --git a/com.discord/res/drawable-ldpi/ic_remove_reaction_24dp.png b/com.discord/res/drawable-ldpi/ic_remove_reaction_24dp.png new file mode 100644 index 0000000000..da7f7a6a20 Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_remove_reaction_24dp.png differ diff --git a/com.discord/res/drawable-mdpi/ic_edit_24dp.png b/com.discord/res/drawable-mdpi/ic_edit_24dp.png new file mode 100644 index 0000000000..a5a1c268b8 Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_edit_24dp.png differ diff --git a/com.discord/res/drawable-mdpi/ic_remove_reaction_24dp.png b/com.discord/res/drawable-mdpi/ic_remove_reaction_24dp.png new file mode 100644 index 0000000000..0f06852733 Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_remove_reaction_24dp.png differ diff --git a/com.discord/res/drawable-xhdpi/ic_edit_24dp.png b/com.discord/res/drawable-xhdpi/ic_edit_24dp.png new file mode 100644 index 0000000000..0b96d0efc9 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_edit_24dp.png differ diff --git a/com.discord/res/drawable-xhdpi/ic_remove_reaction_24dp.png b/com.discord/res/drawable-xhdpi/ic_remove_reaction_24dp.png new file mode 100644 index 0000000000..955ef21a62 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_remove_reaction_24dp.png differ diff --git a/com.discord/res/drawable-xxhdpi/ic_edit_24dp.png b/com.discord/res/drawable-xxhdpi/ic_edit_24dp.png new file mode 100644 index 0000000000..77336f5b91 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_edit_24dp.png differ diff --git a/com.discord/res/drawable-xxhdpi/ic_remove_reaction_24dp.png b/com.discord/res/drawable-xxhdpi/ic_remove_reaction_24dp.png new file mode 100644 index 0000000000..40838a8647 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_remove_reaction_24dp.png differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_edit_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_edit_24dp.png new file mode 100644 index 0000000000..7700d479e3 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_edit_24dp.png differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_remove_reaction_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_remove_reaction_24dp.png new file mode 100644 index 0000000000..0667debbb5 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_remove_reaction_24dp.png differ diff --git a/com.discord/res/drawable/ic_copy_24dp.xml b/com.discord/res/drawable/ic_copy_24dp.xml new file mode 100644 index 0000000000..8957ff8837 --- /dev/null +++ b/com.discord/res/drawable/ic_copy_24dp.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_delete_24dp.xml b/com.discord/res/drawable/ic_delete_24dp.xml new file mode 100644 index 0000000000..c051f5fd96 --- /dev/null +++ b/com.discord/res/drawable/ic_delete_24dp.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_mark_unread_24dp.xml b/com.discord/res/drawable/ic_mark_unread_24dp.xml new file mode 100644 index 0000000000..2479af9980 --- /dev/null +++ b/com.discord/res/drawable/ic_mark_unread_24dp.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_profile_24dp.xml b/com.discord/res/drawable/ic_profile_24dp.xml new file mode 100644 index 0000000000..87ffff2253 --- /dev/null +++ b/com.discord/res/drawable/ic_profile_24dp.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_publish_24dp.xml b/com.discord/res/drawable/ic_publish_24dp.xml new file mode 100644 index 0000000000..cfb3ecc12a --- /dev/null +++ b/com.discord/res/drawable/ic_publish_24dp.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_reaction_24dp.xml b/com.discord/res/drawable/ic_reaction_24dp.xml new file mode 100644 index 0000000000..c5816e6047 --- /dev/null +++ b/com.discord/res/drawable/ic_reaction_24dp.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_resend_24dp.xml b/com.discord/res/drawable/ic_resend_24dp.xml new file mode 100644 index 0000000000..500c93d455 --- /dev/null +++ b/com.discord/res/drawable/ic_resend_24dp.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_share_24dp.xml b/com.discord/res/drawable/ic_share_24dp.xml new file mode 100644 index 0000000000..9e5c7ddf06 --- /dev/null +++ b/com.discord/res/drawable/ic_share_24dp.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/layout/sticker_store_header_item.xml b/com.discord/res/layout/sticker_store_header_item.xml index 3cc1828f4f..d00962fdc3 100644 --- a/com.discord/res/layout/sticker_store_header_item.xml +++ b/com.discord/res/layout/sticker_store_header_item.xml @@ -2,8 +2,6 @@ - - diff --git a/com.discord/res/layout/widget_chat_list_actions.xml b/com.discord/res/layout/widget_chat_list_actions.xml index 3915d5ce30..7788e73504 100644 --- a/com.discord/res/layout/widget_chat_list_actions.xml +++ b/com.discord/res/layout/widget_chat_list_actions.xml @@ -3,19 +3,19 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - - - - - - + + + + + + + + + - - - - - - + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_settings.xml b/com.discord/res/layout/widget_settings.xml index acc9f06e5d..0ae2a744d0 100644 --- a/com.discord/res/layout/widget_settings.xml +++ b/com.discord/res/layout/widget_settings.xml @@ -32,6 +32,7 @@ + diff --git a/com.discord/res/layout/widget_settings_premium.xml b/com.discord/res/layout/widget_settings_premium.xml index 31df60cffc..f07e6bcd18 100644 --- a/com.discord/res/layout/widget_settings_premium.xml +++ b/com.discord/res/layout/widget_settings_premium.xml @@ -11,16 +11,12 @@ - + + - - - - -