From 61f48e54a866487b8369cde67196121c3d4765be Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 9 Mar 2026 16:21:28 +0000 Subject: [PATCH 1/6] Initial plan From 05dd57c5c5870fbb90a5fda4c07328e43874b66b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 9 Mar 2026 16:25:24 +0000 Subject: [PATCH 2/6] Add Java code formatter (Spotless + google-java-format) with CI enforcement Co-authored-by: adbenitez <24558636+adbenitez@users.noreply.github.com> --- .github/workflows/check-format.yml | 35 ++++++++++++++++++++++++++++++ CONTRIBUTING.md | 5 +++++ build.gradle | 11 ++++++++++ gradle.properties | 7 +++++- scripts/format.sh | 3 +++ 5 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/check-format.yml create mode 100755 scripts/format.sh diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml new file mode 100644 index 000000000..6ee96ce16 --- /dev/null +++ b/.github/workflows/check-format.yml @@ -0,0 +1,35 @@ +name: Check Java formatting + +on: + push: + branches: [main] + pull_request: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} + +jobs: + spotless: + name: Check Java formatting (Spotless) + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v5 + - uses: actions/setup-java@v5 + with: + java-version: 17 + distribution: temurin + - uses: actions/cache@v4 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + - name: Validate Gradle Wrapper + uses: gradle/actions/wrapper-validation@v4 + - name: Check formatting + run: ./gradlew spotlessCheck diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 49414fe1b..7976e9d2a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -100,6 +100,11 @@ Try to not follow these patterns and keep things really on point and simple. If this gets in conflict with embracing existing style, however, consistency with existing code is more important. +**Code formatting:** The project uses [google-java-format](https://github.com/google/google-java-format) +(AOSP style, 4-space indent) enforced via the [Spotless](https://github.com/diffplug/spotless) Gradle plugin. +Auto-format all files by running `scripts/format.sh` or `./gradlew spotlessApply` before opening a PR. +CI will fail if files are not formatted correctly — make sure to run the formatter before pushing. + The "Delta Chat Core" is a high-level interface to what the UI actually needs, data should be served in a form that the UI do not need much additional work. If this is not the case, consider a feature proposal to "Delta Chat Core". diff --git a/build.gradle b/build.gradle index be7766d79..32d9c8ae2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ plugins { id 'com.android.application' version '8.11.1' id 'com.google.gms.google-services' version '4.4.1' + id 'com.diffplug.spotless' version '6.25.0' } repositories { @@ -202,6 +203,16 @@ android { } +spotless { + java { + target 'src/**/*.java' + googleJavaFormat('1.19.2').aosp() // AOSP style = 4-space indent, fits Android codebases + removeUnusedImports() + trimTrailingWhitespace() + endWithNewline() + } +} + final def markwon_version = '4.6.2' dependencies { diff --git a/gradle.properties b/gradle.properties index 6563318ea..f6c6351cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,9 @@ android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true android.nonTransitiveRClass=false android.useAndroidX=true -org.gradle.jvmargs=-Xmx4608m +org.gradle.jvmargs=-Xmx4608m \ + --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \ + --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \ + --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \ + --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \ + --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED diff --git a/scripts/format.sh b/scripts/format.sh new file mode 100755 index 000000000..88f62eece --- /dev/null +++ b/scripts/format.sh @@ -0,0 +1,3 @@ +#!/bin/sh +set -e +./gradlew spotlessApply From de34f060afd5308c5a2bf4e1f300fe31ddcf5f72 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 10 Mar 2026 19:05:35 +0000 Subject: [PATCH 3/6] Switch formatter to Google style (2-space indent) matching Android Studio default Co-authored-by: adbenitez <24558636+adbenitez@users.noreply.github.com> --- CONTRIBUTING.md | 2 +- build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7976e9d2a..70407808e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -101,7 +101,7 @@ If this gets in conflict with embracing existing style, however, consistency with existing code is more important. **Code formatting:** The project uses [google-java-format](https://github.com/google/google-java-format) -(AOSP style, 4-space indent) enforced via the [Spotless](https://github.com/diffplug/spotless) Gradle plugin. +(Google style, 2-space indent — matches Android Studio's default formatter) enforced via the [Spotless](https://github.com/diffplug/spotless) Gradle plugin. Auto-format all files by running `scripts/format.sh` or `./gradlew spotlessApply` before opening a PR. CI will fail if files are not formatted correctly — make sure to run the formatter before pushing. diff --git a/build.gradle b/build.gradle index 32d9c8ae2..5d5d2c927 100644 --- a/build.gradle +++ b/build.gradle @@ -206,7 +206,7 @@ android { spotless { java { target 'src/**/*.java' - googleJavaFormat('1.19.2').aosp() // AOSP style = 4-space indent, fits Android codebases + googleJavaFormat('1.19.2') // Google style = 2-space indent, matches Android Studio default removeUnusedImports() trimTrailingWhitespace() endWithNewline() From 59efba80fef83ba6a78ef9cce7ee3fc7c4503e58 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 10 Mar 2026 19:31:23 +0000 Subject: [PATCH 4/6] Add gradlePluginPortal() to pluginManagement so Spotless plugin can be resolved Co-authored-by: adbenitez <24558636+adbenitez@users.noreply.github.com> --- settings.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/settings.gradle b/settings.gradle index 8aeca1ea1..492070dea 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,6 @@ pluginManagement { repositories { + gradlePluginPortal() google() mavenCentral() } From 60ab8bd1f3e05bef29f432f49e82d017e2d08db1 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 10 Mar 2026 19:42:37 +0000 Subject: [PATCH 5/6] Add XML auto-formatting via Spotless eclipseWtp Co-authored-by: adbenitez <24558636+adbenitez@users.noreply.github.com> --- CONTRIBUTING.md | 3 ++- build.gradle | 6 ++++++ gradle.properties | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 70407808e..c5a55a058 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -101,7 +101,8 @@ If this gets in conflict with embracing existing style, however, consistency with existing code is more important. **Code formatting:** The project uses [google-java-format](https://github.com/google/google-java-format) -(Google style, 2-space indent — matches Android Studio's default formatter) enforced via the [Spotless](https://github.com/diffplug/spotless) Gradle plugin. +(Google style, 2-space indent — matches Android Studio's default formatter) for Java files and +Eclipse WTP for XML files, both enforced via the [Spotless](https://github.com/diffplug/spotless) Gradle plugin. Auto-format all files by running `scripts/format.sh` or `./gradlew spotlessApply` before opening a PR. CI will fail if files are not formatted correctly — make sure to run the formatter before pushing. diff --git a/build.gradle b/build.gradle index 5d5d2c927..a570cd96c 100644 --- a/build.gradle +++ b/build.gradle @@ -211,6 +211,12 @@ spotless { trimTrailingWhitespace() endWithNewline() } + format 'xml', { + target 'src/**/*.xml' + eclipseWtp('xml') + trimTrailingWhitespace() + endWithNewline() + } } final def markwon_version = '4.6.2' diff --git a/gradle.properties b/gradle.properties index f6c6351cf..2913532c5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,6 +2,8 @@ android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true android.nonTransitiveRClass=false android.useAndroidX=true +# The --add-exports flags below are required by google-java-format (via Spotless) on Java 17+ +# to access internal compiler APIs for formatting. See https://github.com/diffplug/spotless/issues/834 org.gradle.jvmargs=-Xmx4608m \ --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \ --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \ From 3ae1e759f2a1fa13b9eff0679410865291708dca Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 11 Mar 2026 14:06:42 +0000 Subject: [PATCH 6/6] Configure Eclipse WTP XML formatter for Android Studio-like format - Add spotless/eclipse-wtp-xml.prefs with Eclipse WTP XML formatter config: - splitMultiAttrs=true: each attribute on its own line - indentMultipleAttributes=true: proper indentation of split attributes - indentationChar=space: use spaces instead of tabs - indentationSize=4: 4-space indentation (Android Studio default) - lineWidth=160: prevent unnecessary line wrapping - Update build.gradle to use the new config file - Apply the new formatter to all 378 XML files in the project Co-authored-by: adbenitez <24558636+adbenitez@users.noreply.github.com> --- build.gradle | 2 +- spotless/eclipse-wtp-xml.prefs | 6 + .../res/drawable/ic_launcher_foreground.xml | 26 +- .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 +- .../mipmap-anydpi-v26/ic_launcher_round.xml | 4 +- src/foss/AndroidManifest.xml | 19 +- src/gplay/AndroidManifest.xml | 59 +- src/main/AndroidManifest.xml | 992 ++++++++++-------- src/main/res/anim/animation_toggle_in.xml | 2 +- src/main/res/anim/animation_toggle_out.xml | 2 +- src/main/res/anim/fade_scale_in.xml | 5 +- src/main/res/anim/fade_scale_out.xml | 5 +- src/main/res/anim/slide_from_right.xml | 7 +- src/main/res/anim/slide_to_right.xml | 7 +- .../bottom_pause_to_play_animation.xml | 15 +- .../bottom_play_to_pause_animation.xml | 15 +- src/main/res/animator/rotate_90_animation.xml | 2 +- .../animator/rotate_minus_90_animation.xml | 2 +- .../upper_pause_to_play_animation.xml | 15 +- .../upper_play_to_pause_animation.xml | 15 +- src/main/res/color/text_color_dark_theme.xml | 10 +- .../color/text_color_secondary_dark_theme.xml | 10 +- .../drawable-anydpi-v24/icon_notification.xml | 26 +- .../notification_permanent.xml | 23 +- ...ssage_bubble_background_received_alone.xml | 3 +- .../message_bubble_background_sent_alone.xml | 3 +- ...bble_background_sent_alone_with_border.xml | 7 +- .../button_secondary_background.xml | 10 +- src/main/res/drawable-night/jumpto_btn_bg.xml | 7 +- .../pinned_list_item_background.xml | 13 +- .../pinned_list_item_background_blue.xml | 13 +- .../pinned_list_item_background_gray.xml | 13 +- .../pinned_list_item_background_green.xml | 13 +- .../pinned_list_item_background_pink.xml | 13 +- .../pinned_list_item_background_purple.xml | 13 +- .../pinned_list_item_background_red.xml | 13 +- .../archived_indicator_background.xml | 10 +- .../drawable/attachment_selector_shadow.xml | 4 +- src/main/res/drawable/badge_divider.xml | 5 +- .../res/drawable/baseline_bookmark_24.xml | 12 +- .../drawable/baseline_bookmark_border_24.xml | 16 +- .../drawable/baseline_bookmark_remove_24.xml | 12 +- src/main/res/drawable/baseline_call_24.xml | 14 +- .../res/drawable/baseline_call_end_24.xml | 16 +- src/main/res/drawable/button_bg.xml | 8 +- .../drawable/button_secondary_background.xml | 10 +- src/main/res/drawable/circle_alpha.xml | 7 +- src/main/res/drawable/circle_tintable.xml | 5 +- .../circle_touch_highlight_background.xml | 7 +- .../res/drawable/circle_universal_overlay.xml | 8 +- src/main/res/drawable/circle_white.xml | 8 +- src/main/res/drawable/contact_blocked_24.xml | 16 +- .../drawable/contact_list_divider_dark.xml | 8 +- .../drawable/contact_list_divider_light.xml | 10 +- .../res/drawable/contact_photo_background.xml | 2 +- .../conversation_attachment_close_circle.xml | 16 +- .../drawable/conversation_attachment_edit.xml | 19 +- .../drawable/conversation_item_background.xml | 8 +- .../conversation_item_background_animated.xml | 12 +- ...ersation_item_background_animated_blue.xml | 12 +- ...ersation_item_background_animated_gray.xml | 12 +- ...rsation_item_background_animated_green.xml | 12 +- ...ersation_item_background_animated_pink.xml | 12 +- ...sation_item_background_animated_purple.xml | 12 +- ...versation_item_background_animated_red.xml | 12 +- .../conversation_item_background_blue.xml | 8 +- .../conversation_item_background_gray.xml | 8 +- .../conversation_item_background_green.xml | 8 +- .../conversation_item_background_pink.xml | 8 +- .../conversation_item_background_purple.xml | 8 +- .../conversation_item_background_red.xml | 8 +- ...rsation_item_sent_indicator_text_shape.xml | 6 +- ...on_item_sent_indicator_text_shape_dark.xml | 6 +- .../conversation_item_update_background.xml | 3 +- .../conversation_list_item_background.xml | 13 +- ...conversation_list_item_background_blue.xml | 13 +- ...conversation_list_item_background_gray.xml | 13 +- ...onversation_list_item_background_green.xml | 13 +- ...conversation_list_item_background_pink.xml | 13 +- ...nversation_list_item_background_purple.xml | 13 +- .../conversation_list_item_background_red.xml | 13 +- .../delete_account_item_background.xml | 3 +- src/main/res/drawable/dismiss_background.xml | 7 +- src/main/res/drawable/divider_end.xml | 15 +- src/main/res/drawable/divider_start.xml | 15 +- .../res/drawable/floating_mini_bg_dark.xml | 5 +- .../res/drawable/floating_mini_bg_light.xml | 5 +- src/main/res/drawable/ic_advanced_24dp.xml | 5 +- .../res/drawable/ic_alternate_email_24.xml | 14 +- src/main/res/drawable/ic_apps_24.xml | 12 +- .../res/drawable/ic_baseline_devices_24.xml | 14 +- src/main/res/drawable/ic_baseline_eye.xml | 9 +- .../res/drawable/ic_brightness_6_24dp.xml | 5 +- src/main/res/drawable/ic_chevron_up.xml | 9 +- .../drawable/ic_delivery_status_failed.xml | 14 +- src/main/res/drawable/ic_donate_24dp.xml | 12 +- src/main/res/drawable/ic_forum_24dp.xml | 5 +- .../res/drawable/ic_forward_white_24dp.xml | 13 +- src/main/res/drawable/ic_help_24dp.xml | 5 +- .../res/drawable/ic_launcher_foreground.xml | 26 +- .../ic_launcher_foreground_monochrome.xml | 22 +- src/main/res/drawable/ic_link_24.xml | 12 +- src/main/res/drawable/ic_lock.xml | 9 +- src/main/res/drawable/ic_lock_24dp.xml | 5 +- src/main/res/drawable/ic_map_white_24dp.xml | 14 +- .../res/drawable/ic_notifications_24dp.xml | 5 +- src/main/res/drawable/ic_outline_email.xml | 6 +- src/main/res/drawable/ic_person_large.xml | 12 +- .../res/drawable/ic_proxy_disabled_24.xml | 16 +- src/main/res/drawable/ic_proxy_enabled_24.xml | 16 +- src/main/res/drawable/ic_qr_code_24.xml | 12 +- .../res/drawable/ic_qr_code_scanner_24.xml | 12 +- src/main/res/drawable/ic_share_white_24dp.xml | 14 +- src/main/res/drawable/ic_swap_vert_24dp.xml | 5 +- src/main/res/drawable/ic_timer_gray_18dp.xml | 14 +- src/main/res/drawable/ic_verified.xml | 20 +- .../res/drawable/ic_videocam_white_24dp.xml | 14 +- src/main/res/drawable/image_shade.xml | 2 +- src/main/res/drawable/jumpto_btn_bg.xml | 7 +- ...ssage_bubble_background_received_alone.xml | 3 +- .../message_bubble_background_sent_alone.xml | 3 +- ...bble_background_sent_alone_with_border.xml | 7 +- src/main/res/drawable/pause_icon.xml | 6 +- .../res/drawable/pause_to_play_animation.xml | 9 +- .../drawable/pinned_list_item_background.xml | 13 +- .../pinned_list_item_background_blue.xml | 13 +- .../pinned_list_item_background_gray.xml | 13 +- .../pinned_list_item_background_green.xml | 13 +- .../pinned_list_item_background_pink.xml | 13 +- .../pinned_list_item_background_purple.xml | 13 +- .../pinned_list_item_background_red.xml | 13 +- src/main/res/drawable/play_icon.xml | 6 +- .../res/drawable/play_to_pause_animation.xml | 9 +- .../res/drawable/reaction_pill_background.xml | 4 +- .../reaction_pill_background_selected.xml | 4 +- .../recording_lock_background_dark.xml | 6 +- .../recording_lock_background_light.xml | 6 +- .../res/drawable/rounded_arrow_forward_24.xml | 13 +- .../res/drawable/search_toolbar_shadow.xml | 13 +- src/main/res/drawable/send_button_bg.xml | 5 +- .../sticky_date_header_background_dark.xml | 2 +- .../sticky_date_header_background_light.xml | 2 +- .../drawable/touch_highlight_background.xml | 3 +- src/main/res/drawable/triangle_right.xml | 5 +- ...conversation_activity_emojidrawer_stub.xml | 24 +- src/main/res/layout-land/reaction_picker.xml | 2 +- .../account_selection_list_fragment.xml | 15 +- .../layout/account_selection_list_item.xml | 95 +- .../activity_application_preferences.xml | 10 +- .../res/layout/activity_blocked_contacts.xml | 10 +- .../activity_conversation_list_archive.xml | 10 +- .../res/layout/activity_edittransport.xml | 715 +++++++------ src/main/res/layout/activity_qr.xml | 6 +- src/main/res/layout/activity_qr_show.xml | 13 +- .../activity_registration_2nd_device_qr.xml | 14 +- .../res/layout/activity_registration_qr.xml | 6 +- src/main/res/layout/activity_relay_list.xml | 38 +- .../activity_select_chat_background.xml | 2 +- src/main/res/layout/all_media_activity.xml | 64 +- .../res/layout/attachment_type_selector.xml | 63 +- src/main/res/layout/audio_view.xml | 128 +-- src/main/res/layout/avatar_selector.xml | 275 ++--- src/main/res/layout/avatar_view.xml | 46 +- .../res/layout/backup_provider_activity.xml | 12 +- .../res/layout/backup_provider_fragment.xml | 202 ++-- .../res/layout/backup_receiver_fragment.xml | 64 +- src/main/res/layout/call_item_view.xml | 63 +- .../res/layout/contact_filter_toolbar.xml | 39 +- .../res/layout/contact_selection_activity.xml | 38 +- .../layout/contact_selection_list_divider.xml | 36 +- .../contact_selection_list_fragment.xml | 42 +- .../layout/contact_selection_list_item.xml | 108 +- src/main/res/layout/conversation_activity.xml | 50 +- ...sation_activity_attachment_editor_stub.xml | 132 ++- ...conversation_activity_emojidrawer_stub.xml | 24 +- src/main/res/layout/conversation_fragment.xml | 54 +- .../res/layout/conversation_input_panel.xml | 6 +- .../res/layout/conversation_item_call.xml | 14 +- .../res/layout/conversation_item_received.xml | 458 ++++---- .../conversation_item_received_audio.xml | 12 +- .../conversation_item_received_document.xml | 14 +- .../conversation_item_received_thumbnail.xml | 20 +- .../res/layout/conversation_item_sent.xml | 39 +- .../layout/conversation_item_sent_audio.xml | 8 +- .../conversation_item_sent_document.xml | 14 +- .../conversation_item_sent_thumbnail.xml | 24 +- .../layout/conversation_item_thumbnail.xml | 5 +- .../res/layout/conversation_item_update.xml | 8 +- .../res/layout/conversation_item_vcard.xml | 14 +- .../res/layout/conversation_item_webxdc.xml | 14 +- .../res/layout/conversation_list_activity.xml | 183 ++-- .../res/layout/conversation_list_fragment.xml | 108 +- .../conversation_list_item_inbox_zero.xml | 33 +- .../layout/conversation_list_item_view.xml | 123 +-- .../res/layout/conversation_title_view.xml | 75 +- .../custom_default_preference_dialog.xml | 60 +- src/main/res/layout/dialog_delete_profile.xml | 141 ++- .../res/layout/dialog_extended_options.xml | 38 +- src/main/res/layout/dialog_progress.xml | 4 +- .../res/layout/dialog_share_invite_link.xml | 64 +- src/main/res/layout/dialog_share_proxy.xml | 29 +- src/main/res/layout/dialog_with_checkbox.xml | 4 +- src/main/res/layout/document_view.xml | 99 +- src/main/res/layout/fragment_search.xml | 20 +- src/main/res/layout/fragment_view_log.xml | 51 +- src/main/res/layout/group_create_activity.xml | 28 +- src/main/res/layout/image_editor_hud.xml | 8 +- .../layout/instant_onboarding_activity.xml | 296 +++--- src/main/res/layout/item_color.xml | 6 +- src/main/res/layout/log_view_activity.xml | 2 +- src/main/res/layout/login_options_view.xml | 52 +- .../res/layout/media_preview_activity.xml | 17 +- src/main/res/layout/media_view.xml | 32 +- .../res/layout/media_view_edit_button.xml | 17 +- src/main/res/layout/media_view_page.xml | 17 +- .../res/layout/media_view_remove_button.xml | 15 +- src/main/res/layout/media_view_video.xml | 10 +- src/main/res/layout/message_details_view.xml | 2 +- .../res/layout/message_request_bottom_bar.xml | 77 +- .../res/layout/microphone_recorder_view.xml | 3 +- src/main/res/layout/new_contact_activity.xml | 111 +- .../layout/permissions_rationale_dialog.xml | 41 +- src/main/res/layout/preference_item.xml | 36 +- src/main/res/layout/profile_activity.xml | 38 +- src/main/res/layout/profile_avatar_item.xml | 51 +- .../res/layout/profile_create_activity.xml | 100 +- src/main/res/layout/profile_divider.xml | 22 +- src/main/res/layout/profile_document_item.xml | 86 +- .../res/layout/profile_documents_fragment.xml | 38 +- src/main/res/layout/profile_fragment.xml | 19 +- .../res/layout/profile_gallery_fragment.xml | 38 +- src/main/res/layout/profile_gallery_item.xml | 18 +- .../res/layout/profile_preference_view.xml | 70 +- src/main/res/layout/profile_status_item.xml | 30 +- src/main/res/layout/profile_text_item.xml | 12 +- .../res/layout/profile_text_item_button.xml | 15 +- .../res/layout/profile_text_item_small.xml | 36 +- src/main/res/layout/proxy_list_footer.xml | 26 +- src/main/res/layout/proxy_list_header.xml | 3 +- src/main/res/layout/proxy_list_item.xml | 86 +- .../res/layout/proxy_settings_activity.xml | 28 +- src/main/res/layout/qr_scan_fragment.xml | 21 +- src/main/res/layout/qr_show_fragment.xml | 72 +- src/main/res/layout/quote_view.xml | 246 ++--- src/main/res/layout/reaction_picker.xml | 2 +- .../res/layout/reaction_recipient_item.xml | 65 +- .../res/layout/reactions_details_fragment.xml | 15 +- src/main/res/layout/reactions_pill.xml | 46 +- src/main/res/layout/recent_photo_view.xml | 6 +- .../res/layout/recent_photo_view_item.xml | 24 +- src/main/res/layout/recording_layout.xml | 71 +- src/main/res/layout/relay_list_item.xml | 78 +- .../scribble_select_sticker_activity.xml | 48 +- .../scribble_select_sticker_fragment.xml | 2 +- src/main/res/layout/scribble_sticker_item.xml | 13 +- src/main/res/layout/search_toolbar.xml | 30 +- .../res/layout/selected_contact_list_item.xml | 56 +- src/main/res/layout/share_activity.xml | 39 +- src/main/res/layout/signup_options_view.xml | 68 +- src/main/res/layout/sticker_view.xml | 4 +- .../res/layout/switch_compat_preference.xml | 17 +- .../layout/transport_selection_list_item.xml | 73 +- src/main/res/layout/vcard_view.xml | 54 +- src/main/res/layout/video_player.xml | 21 +- src/main/res/layout/web_view_activity.xml | 21 +- src/main/res/layout/webxdc_compact_view.xml | 101 +- src/main/res/layout/webxdc_view.xml | 90 +- src/main/res/layout/welcome_activity.xml | 134 +-- src/main/res/layout/zooming_image_view.xml | 26 +- src/main/res/menu/account_item_context.xml | 20 +- src/main/res/menu/add_members.xml | 13 +- src/main/res/menu/archived_list.xml | 11 +- src/main/res/menu/backup_transfer_menu.xml | 27 +- src/main/res/menu/chat_background.xml | 15 +- src/main/res/menu/contact_list.xml | 26 +- src/main/res/menu/conversation.xml | 92 +- src/main/res/menu/conversation_context.xml | 44 +- src/main/res/menu/conversation_list.xml | 74 +- .../res/menu/conversation_list_search.xml | 18 +- src/main/res/menu/forwarding_menu.xml | 13 +- src/main/res/menu/full_msg.xml | 3 +- src/main/res/menu/group_create.xml | 15 +- src/main/res/menu/instant_onboarding_menu.xml | 16 +- src/main/res/menu/local_help.xml | 27 +- src/main/res/menu/media_preview.xml | 39 +- src/main/res/menu/new_contact.xml | 13 +- .../menu/preferences_create_profile_menu.xml | 7 +- src/main/res/menu/profile_common.xml | 48 +- src/main/res/menu/profile_context.xml | 40 +- src/main/res/menu/profile_title_context.xml | 5 +- src/main/res/menu/qr_show.xml | 32 +- src/main/res/menu/registration.xml | 15 +- .../res/menu/registration_qr_activity.xml | 20 +- src/main/res/menu/relay_item_context.xml | 10 +- src/main/res/menu/search_menu.xml | 15 +- src/main/res/menu/text_secure_normal.xml | 37 +- src/main/res/menu/view_log.xml | 23 +- src/main/res/menu/web_view.xml | 22 +- src/main/res/menu/web_view_context.xml | 14 +- src/main/res/menu/webxdc.xml | 12 +- .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 +- .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 +- src/main/res/values-ar/strings.xml | 17 +- src/main/res/values-az/strings.xml | 59 +- src/main/res/values-bg/strings.xml | 191 ++-- src/main/res/values-bqi/strings.xml | 32 +- src/main/res/values-ca/strings.xml | 236 +++-- src/main/res/values-ckb/strings.xml | 58 +- src/main/res/values-cs/strings.xml | 188 ++-- src/main/res/values-da/strings.xml | 92 +- src/main/res/values-de/strings.xml | 217 ++-- src/main/res/values-el/strings.xml | 141 ++- src/main/res/values-eo/strings.xml | 45 +- src/main/res/values-es/strings.xml | 226 ++-- src/main/res/values-es/strings_arcanechat.xml | 27 +- src/main/res/values-et/strings.xml | 207 ++-- src/main/res/values-eu/strings.xml | 229 ++-- src/main/res/values-eu/strings_arcanechat.xml | 34 +- src/main/res/values-fa/strings.xml | 289 +++-- src/main/res/values-fi/strings.xml | 155 ++- src/main/res/values-fr/strings.xml | 254 +++-- src/main/res/values-gl/strings.xml | 172 ++- src/main/res/values-hr/strings.xml | 17 +- src/main/res/values-hu/strings.xml | 236 +++-- src/main/res/values-in/strings.xml | 64 +- src/main/res/values-it/strings.xml | 228 ++-- src/main/res/values-ja/strings.xml | 29 +- src/main/res/values-kab/strings.xml | 209 ++-- src/main/res/values-ko/strings.xml | 59 +- src/main/res/values-lt/strings.xml | 156 ++- src/main/res/values-nb/strings.xml | 70 +- src/main/res/values-night/themes_splash.xml | 4 +- src/main/res/values-nl/strings.xml | 227 ++-- src/main/res/values-pl/strings.xml | 223 ++-- src/main/res/values-pt-rBR/strings.xml | 164 ++- src/main/res/values-pt/strings.xml | 74 +- src/main/res/values-ro/strings.xml | 60 +- src/main/res/values-ru/strings.xml | 218 ++-- src/main/res/values-sc/strings.xml | 53 +- src/main/res/values-sk/strings.xml | 156 ++- src/main/res/values-sq/strings.xml | 217 ++-- src/main/res/values-sr/strings.xml | 115 +- src/main/res/values-sv/strings.xml | 180 +++- src/main/res/values-sw320dp/dimens.xml | 2 +- .../res/values-sw360dp/values-preferences.xml | 4 +- src/main/res/values-sw480dp/dimens.xml | 2 +- src/main/res/values-sw600dp/attrs.xml | 2 +- src/main/res/values-ta/strings.xml | 17 +- src/main/res/values-te/strings.xml | 17 +- src/main/res/values-tr/strings.xml | 213 ++-- src/main/res/values-uk/strings.xml | 222 ++-- src/main/res/values-v29/arrays.xml | 49 +- src/main/res/values-vi/strings.xml | 128 ++- src/main/res/values-zh-rCN/strings.xml | 100 +- src/main/res/values-zh-rTW/strings.xml | 96 +- src/main/res/values/arrays.xml | 336 +++--- src/main/res/values/attrs.xml | 514 ++++++--- src/main/res/values/colors.xml | 142 +-- src/main/res/values/crop_area_renderer.xml | 2 +- src/main/res/values/dimens.xml | 2 +- .../res/values/ic_launcher_background.xml | 2 +- src/main/res/values/ids.xml | 32 +- src/main/res/values/integers.xml | 2 +- src/main/res/values/material_colors.xml | 2 +- src/main/res/values/strings.xml | 194 ++-- src/main/res/values/strings_arcanechat.xml | 34 +- src/main/res/values/styles.xml | 122 ++- src/main/res/values/text_styles.xml | 24 +- src/main/res/values/themes.xml | 156 ++- src/main/res/values/themes_splash.xml | 4 +- src/main/res/values/vector_paths.xml | 4 +- .../res/xml-v29/preferences_appearance.xml | 15 +- src/main/res/xml/file_provider_paths.xml | 28 +- src/main/res/xml/preferences.xml | 97 +- src/main/res/xml/preferences_advanced.xml | 28 +- src/main/res/xml/preferences_appearance.xml | 16 +- src/main/res/xml/preferences_chats.xml | 9 +- .../res/xml/preferences_notifications.xml | 116 +- src/main/res/xml/preferences_privacy.xml | 7 +- src/main/res/xml/shortcuts.xml | 8 +- 380 files changed, 11102 insertions(+), 7525 deletions(-) create mode 100644 spotless/eclipse-wtp-xml.prefs diff --git a/build.gradle b/build.gradle index a570cd96c..17b11ae37 100644 --- a/build.gradle +++ b/build.gradle @@ -213,7 +213,7 @@ spotless { } format 'xml', { target 'src/**/*.xml' - eclipseWtp('xml') + eclipseWtp('xml').configFile('spotless/eclipse-wtp-xml.prefs') trimTrailingWhitespace() endWithNewline() } diff --git a/spotless/eclipse-wtp-xml.prefs b/spotless/eclipse-wtp-xml.prefs new file mode 100644 index 000000000..862e8fe03 --- /dev/null +++ b/spotless/eclipse-wtp-xml.prefs @@ -0,0 +1,6 @@ +eclipse.preferences.version=1 +lineWidth=160 +splitMultiAttrs=true +indentMultipleAttributes=true +indentationChar=space +indentationSize=4 diff --git a/src/debug/res/drawable/ic_launcher_foreground.xml b/src/debug/res/drawable/ic_launcher_foreground.xml index 6be6d473f..b1fe6fe18 100644 --- a/src/debug/res/drawable/ic_launcher_foreground.xml +++ b/src/debug/res/drawable/ic_launcher_foreground.xml @@ -1,17 +1,19 @@ - - - - - + + + + diff --git a/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml index 8111c6f84..0c42a4264 100644 --- a/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml b/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml index 5005f3469..d6cd2ee93 100644 --- a/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + diff --git a/src/foss/AndroidManifest.xml b/src/foss/AndroidManifest.xml index 498c668a4..0b0b6e5ce 100644 --- a/src/foss/AndroidManifest.xml +++ b/src/foss/AndroidManifest.xml @@ -1,14 +1,15 @@ - + - + - - - + + + diff --git a/src/gplay/AndroidManifest.xml b/src/gplay/AndroidManifest.xml index b0d786db4..f8f53d5c9 100644 --- a/src/gplay/AndroidManifest.xml +++ b/src/gplay/AndroidManifest.xml @@ -1,34 +1,41 @@ - + - - + + - - - + + + - - + + - - - - - + + + + + - - - + + + diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 7d633f8ad..9c03041b9 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,22 +1,45 @@ - - - - - - - - - - + + + + + + + + + - - + + @@ -41,458 +64,513 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/src/main/res/anim/animation_toggle_in.xml b/src/main/res/anim/animation_toggle_in.xml index ffffd02d1..ea9ea31f2 100644 --- a/src/main/res/anim/animation_toggle_in.xml +++ b/src/main/res/anim/animation_toggle_in.xml @@ -12,4 +12,4 @@ android:duration="150" android:fromAlpha="0.0" android:toAlpha="1.0" /> - \ No newline at end of file + diff --git a/src/main/res/anim/animation_toggle_out.xml b/src/main/res/anim/animation_toggle_out.xml index 1e6f7ed63..5f30d2592 100644 --- a/src/main/res/anim/animation_toggle_out.xml +++ b/src/main/res/anim/animation_toggle_out.xml @@ -12,4 +12,4 @@ android:duration="150" android:fromAlpha="1.0" android:toAlpha="0.0" /> - \ No newline at end of file + diff --git a/src/main/res/anim/fade_scale_in.xml b/src/main/res/anim/fade_scale_in.xml index 0f2def07d..8a29147b1 100644 --- a/src/main/res/anim/fade_scale_in.xml +++ b/src/main/res/anim/fade_scale_in.xml @@ -1,6 +1,7 @@ - - \ No newline at end of file + diff --git a/src/main/res/anim/fade_scale_out.xml b/src/main/res/anim/fade_scale_out.xml index 2ee729071..a5610588f 100644 --- a/src/main/res/anim/fade_scale_out.xml +++ b/src/main/res/anim/fade_scale_out.xml @@ -1,6 +1,7 @@ - - \ No newline at end of file + diff --git a/src/main/res/anim/slide_from_right.xml b/src/main/res/anim/slide_from_right.xml index 7dbec61f3..b6348e740 100644 --- a/src/main/res/anim/slide_from_right.xml +++ b/src/main/res/anim/slide_from_right.xml @@ -1,9 +1,10 @@ - + - \ No newline at end of file + diff --git a/src/main/res/anim/slide_to_right.xml b/src/main/res/anim/slide_to_right.xml index c655fcd12..4621f980e 100644 --- a/src/main/res/anim/slide_to_right.xml +++ b/src/main/res/anim/slide_to_right.xml @@ -1,9 +1,10 @@ - + - \ No newline at end of file + diff --git a/src/main/res/animator/bottom_pause_to_play_animation.xml b/src/main/res/animator/bottom_pause_to_play_animation.xml index f5b474bb7..7d0dba8c8 100644 --- a/src/main/res/animator/bottom_pause_to_play_animation.xml +++ b/src/main/res/animator/bottom_pause_to_play_animation.xml @@ -1,8 +1,9 @@ - \ No newline at end of file + diff --git a/src/main/res/animator/bottom_play_to_pause_animation.xml b/src/main/res/animator/bottom_play_to_pause_animation.xml index 4f2778d68..31f41823d 100644 --- a/src/main/res/animator/bottom_play_to_pause_animation.xml +++ b/src/main/res/animator/bottom_play_to_pause_animation.xml @@ -1,8 +1,9 @@ - \ No newline at end of file + diff --git a/src/main/res/animator/rotate_90_animation.xml b/src/main/res/animator/rotate_90_animation.xml index 7d44ce690..88dd56cc5 100644 --- a/src/main/res/animator/rotate_90_animation.xml +++ b/src/main/res/animator/rotate_90_animation.xml @@ -6,4 +6,4 @@ android:propertyName="rotation" android:valueFrom="0" android:valueTo="90" - android:valueType="floatType"/> \ No newline at end of file + android:valueType="floatType" /> diff --git a/src/main/res/animator/rotate_minus_90_animation.xml b/src/main/res/animator/rotate_minus_90_animation.xml index ef9e1b6f1..501e5f98b 100644 --- a/src/main/res/animator/rotate_minus_90_animation.xml +++ b/src/main/res/animator/rotate_minus_90_animation.xml @@ -6,4 +6,4 @@ android:propertyName="rotation" android:valueFrom="90" android:valueTo="0" - android:valueType="floatType"/> \ No newline at end of file + android:valueType="floatType" /> diff --git a/src/main/res/animator/upper_pause_to_play_animation.xml b/src/main/res/animator/upper_pause_to_play_animation.xml index 880c7b0b8..8dd9a7ca7 100644 --- a/src/main/res/animator/upper_pause_to_play_animation.xml +++ b/src/main/res/animator/upper_pause_to_play_animation.xml @@ -1,8 +1,9 @@ - \ No newline at end of file + diff --git a/src/main/res/animator/upper_play_to_pause_animation.xml b/src/main/res/animator/upper_play_to_pause_animation.xml index ffa933231..8a5aee5cb 100644 --- a/src/main/res/animator/upper_play_to_pause_animation.xml +++ b/src/main/res/animator/upper_play_to_pause_animation.xml @@ -1,8 +1,9 @@ - \ No newline at end of file + diff --git a/src/main/res/color/text_color_dark_theme.xml b/src/main/res/color/text_color_dark_theme.xml index 95308fe1a..d74b3e6c4 100644 --- a/src/main/res/color/text_color_dark_theme.xml +++ b/src/main/res/color/text_color_dark_theme.xml @@ -1,5 +1,7 @@ - - - - \ No newline at end of file + + + + diff --git a/src/main/res/color/text_color_secondary_dark_theme.xml b/src/main/res/color/text_color_secondary_dark_theme.xml index 5510b324c..9dd39f59a 100644 --- a/src/main/res/color/text_color_secondary_dark_theme.xml +++ b/src/main/res/color/text_color_secondary_dark_theme.xml @@ -1,5 +1,7 @@ - - - - \ No newline at end of file + + + + diff --git a/src/main/res/drawable-anydpi-v24/icon_notification.xml b/src/main/res/drawable-anydpi-v24/icon_notification.xml index d59648bca..4ad08a820 100644 --- a/src/main/res/drawable-anydpi-v24/icon_notification.xml +++ b/src/main/res/drawable-anydpi-v24/icon_notification.xml @@ -1,18 +1,20 @@ - - - - - + + + + diff --git a/src/main/res/drawable-anydpi-v24/notification_permanent.xml b/src/main/res/drawable-anydpi-v24/notification_permanent.xml index 939f87946..0283db96a 100644 --- a/src/main/res/drawable-anydpi-v24/notification_permanent.xml +++ b/src/main/res/drawable-anydpi-v24/notification_permanent.xml @@ -1,18 +1,25 @@ - - > + + > - + - + - + diff --git a/src/main/res/drawable-ldrtl/message_bubble_background_received_alone.xml b/src/main/res/drawable-ldrtl/message_bubble_background_received_alone.xml index fff6b14b6..cfe5181cc 100644 --- a/src/main/res/drawable-ldrtl/message_bubble_background_received_alone.xml +++ b/src/main/res/drawable-ldrtl/message_bubble_background_received_alone.xml @@ -1,6 +1,5 @@ - + diff --git a/src/main/res/drawable-ldrtl/message_bubble_background_sent_alone.xml b/src/main/res/drawable-ldrtl/message_bubble_background_sent_alone.xml index 196688a09..19e7ea2f1 100644 --- a/src/main/res/drawable-ldrtl/message_bubble_background_sent_alone.xml +++ b/src/main/res/drawable-ldrtl/message_bubble_background_sent_alone.xml @@ -1,6 +1,5 @@ - + diff --git a/src/main/res/drawable-ldrtl/message_bubble_background_sent_alone_with_border.xml b/src/main/res/drawable-ldrtl/message_bubble_background_sent_alone_with_border.xml index 315f63174..3da4f5a41 100644 --- a/src/main/res/drawable-ldrtl/message_bubble_background_sent_alone_with_border.xml +++ b/src/main/res/drawable-ldrtl/message_bubble_background_sent_alone_with_border.xml @@ -1,11 +1,12 @@ - + - + - - - + + + diff --git a/src/main/res/drawable-night/jumpto_btn_bg.xml b/src/main/res/drawable-night/jumpto_btn_bg.xml index be9119122..3f435878e 100644 --- a/src/main/res/drawable-night/jumpto_btn_bg.xml +++ b/src/main/res/drawable-night/jumpto_btn_bg.xml @@ -1,5 +1,6 @@ - - + + diff --git a/src/main/res/drawable-night/pinned_list_item_background.xml b/src/main/res/drawable-night/pinned_list_item_background.xml index dc98397b0..a4a4cc66b 100644 --- a/src/main/res/drawable-night/pinned_list_item_background.xml +++ b/src/main/res/drawable-night/pinned_list_item_background.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable-night/pinned_list_item_background_blue.xml b/src/main/res/drawable-night/pinned_list_item_background_blue.xml index 084144a4b..b618da3f7 100644 --- a/src/main/res/drawable-night/pinned_list_item_background_blue.xml +++ b/src/main/res/drawable-night/pinned_list_item_background_blue.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable-night/pinned_list_item_background_gray.xml b/src/main/res/drawable-night/pinned_list_item_background_gray.xml index c0e41aaf0..c2be44695 100644 --- a/src/main/res/drawable-night/pinned_list_item_background_gray.xml +++ b/src/main/res/drawable-night/pinned_list_item_background_gray.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable-night/pinned_list_item_background_green.xml b/src/main/res/drawable-night/pinned_list_item_background_green.xml index 683182c4e..aec174734 100644 --- a/src/main/res/drawable-night/pinned_list_item_background_green.xml +++ b/src/main/res/drawable-night/pinned_list_item_background_green.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable-night/pinned_list_item_background_pink.xml b/src/main/res/drawable-night/pinned_list_item_background_pink.xml index 6004e6211..72abb7e67 100644 --- a/src/main/res/drawable-night/pinned_list_item_background_pink.xml +++ b/src/main/res/drawable-night/pinned_list_item_background_pink.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable-night/pinned_list_item_background_purple.xml b/src/main/res/drawable-night/pinned_list_item_background_purple.xml index e9b33c6fb..dec42d0bb 100644 --- a/src/main/res/drawable-night/pinned_list_item_background_purple.xml +++ b/src/main/res/drawable-night/pinned_list_item_background_purple.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable-night/pinned_list_item_background_red.xml b/src/main/res/drawable-night/pinned_list_item_background_red.xml index 6a27959db..aaef90864 100644 --- a/src/main/res/drawable-night/pinned_list_item_background_red.xml +++ b/src/main/res/drawable-night/pinned_list_item_background_red.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable/archived_indicator_background.xml b/src/main/res/drawable/archived_indicator_background.xml index 046602984..5fdb94126 100644 --- a/src/main/res/drawable/archived_indicator_background.xml +++ b/src/main/res/drawable/archived_indicator_background.xml @@ -1,6 +1,10 @@ - + - - + + diff --git a/src/main/res/drawable/attachment_selector_shadow.xml b/src/main/res/drawable/attachment_selector_shadow.xml index 34e2aa8cd..2e7d4a13c 100644 --- a/src/main/res/drawable/attachment_selector_shadow.xml +++ b/src/main/res/drawable/attachment_selector_shadow.xml @@ -6,6 +6,6 @@ + android:angle="90" /> - \ No newline at end of file + diff --git a/src/main/res/drawable/badge_divider.xml b/src/main/res/drawable/badge_divider.xml index 9db9b4665..c741317f5 100644 --- a/src/main/res/drawable/badge_divider.xml +++ b/src/main/res/drawable/badge_divider.xml @@ -1,5 +1,6 @@ - + diff --git a/src/main/res/drawable/baseline_bookmark_24.xml b/src/main/res/drawable/baseline_bookmark_24.xml index 77251324b..81fd358b1 100644 --- a/src/main/res/drawable/baseline_bookmark_24.xml +++ b/src/main/res/drawable/baseline_bookmark_24.xml @@ -1,3 +1,11 @@ - - + + diff --git a/src/main/res/drawable/baseline_bookmark_border_24.xml b/src/main/res/drawable/baseline_bookmark_border_24.xml index d64b0ea27..def67c538 100644 --- a/src/main/res/drawable/baseline_bookmark_border_24.xml +++ b/src/main/res/drawable/baseline_bookmark_border_24.xml @@ -1,5 +1,13 @@ - - - - + + + + diff --git a/src/main/res/drawable/baseline_bookmark_remove_24.xml b/src/main/res/drawable/baseline_bookmark_remove_24.xml index 1fb5c5a92..d28658778 100644 --- a/src/main/res/drawable/baseline_bookmark_remove_24.xml +++ b/src/main/res/drawable/baseline_bookmark_remove_24.xml @@ -1,3 +1,11 @@ - - + + diff --git a/src/main/res/drawable/baseline_call_24.xml b/src/main/res/drawable/baseline_call_24.xml index 2aba8addc..4e81fb715 100644 --- a/src/main/res/drawable/baseline_call_24.xml +++ b/src/main/res/drawable/baseline_call_24.xml @@ -1,5 +1,11 @@ - - + + diff --git a/src/main/res/drawable/baseline_call_end_24.xml b/src/main/res/drawable/baseline_call_end_24.xml index fa4cd2c10..82d2d30cc 100644 --- a/src/main/res/drawable/baseline_call_end_24.xml +++ b/src/main/res/drawable/baseline_call_end_24.xml @@ -1,5 +1,13 @@ - - - - + + + + diff --git a/src/main/res/drawable/button_bg.xml b/src/main/res/drawable/button_bg.xml index 9e5b10938..c1c526333 100644 --- a/src/main/res/drawable/button_bg.xml +++ b/src/main/res/drawable/button_bg.xml @@ -1,5 +1,7 @@ - - - + + + diff --git a/src/main/res/drawable/button_secondary_background.xml b/src/main/res/drawable/button_secondary_background.xml index 8fe84fca5..fa4d7cad1 100644 --- a/src/main/res/drawable/button_secondary_background.xml +++ b/src/main/res/drawable/button_secondary_background.xml @@ -1,6 +1,10 @@ - - - + + + diff --git a/src/main/res/drawable/circle_alpha.xml b/src/main/res/drawable/circle_alpha.xml index 82142dd34..3c8344cd4 100644 --- a/src/main/res/drawable/circle_alpha.xml +++ b/src/main/res/drawable/circle_alpha.xml @@ -1,5 +1,6 @@ - - + + diff --git a/src/main/res/drawable/circle_tintable.xml b/src/main/res/drawable/circle_tintable.xml index 6c5c36063..60c36468e 100644 --- a/src/main/res/drawable/circle_tintable.xml +++ b/src/main/res/drawable/circle_tintable.xml @@ -1,5 +1,6 @@ - + diff --git a/src/main/res/drawable/circle_touch_highlight_background.xml b/src/main/res/drawable/circle_touch_highlight_background.xml index fe392b45e..35ec52275 100644 --- a/src/main/res/drawable/circle_touch_highlight_background.xml +++ b/src/main/res/drawable/circle_touch_highlight_background.xml @@ -1,9 +1,10 @@ - + - \ No newline at end of file + diff --git a/src/main/res/drawable/circle_universal_overlay.xml b/src/main/res/drawable/circle_universal_overlay.xml index 32c516245..39fc33611 100644 --- a/src/main/res/drawable/circle_universal_overlay.xml +++ b/src/main/res/drawable/circle_universal_overlay.xml @@ -1,4 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/src/main/res/drawable/circle_white.xml b/src/main/res/drawable/circle_white.xml index 631057c46..60c36468e 100644 --- a/src/main/res/drawable/circle_white.xml +++ b/src/main/res/drawable/circle_white.xml @@ -1,4 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/src/main/res/drawable/contact_blocked_24.xml b/src/main/res/drawable/contact_blocked_24.xml index 3368f8111..370a3d81d 100644 --- a/src/main/res/drawable/contact_blocked_24.xml +++ b/src/main/res/drawable/contact_blocked_24.xml @@ -1,5 +1,13 @@ - - - - + + + + diff --git a/src/main/res/drawable/contact_list_divider_dark.xml b/src/main/res/drawable/contact_list_divider_dark.xml index ab63ce24a..5b294af13 100644 --- a/src/main/res/drawable/contact_list_divider_dark.xml +++ b/src/main/res/drawable/contact_list_divider_dark.xml @@ -3,9 +3,13 @@ - + - + diff --git a/src/main/res/drawable/contact_list_divider_light.xml b/src/main/res/drawable/contact_list_divider_light.xml index f28cf73f6..a5462769b 100644 --- a/src/main/res/drawable/contact_list_divider_light.xml +++ b/src/main/res/drawable/contact_list_divider_light.xml @@ -3,10 +3,14 @@ - + - + - \ No newline at end of file + diff --git a/src/main/res/drawable/contact_photo_background.xml b/src/main/res/drawable/contact_photo_background.xml index ff1153bf2..befe35636 100644 --- a/src/main/res/drawable/contact_photo_background.xml +++ b/src/main/res/drawable/contact_photo_background.xml @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/src/main/res/drawable/conversation_attachment_close_circle.xml b/src/main/res/drawable/conversation_attachment_close_circle.xml index 86741f86e..158d39631 100644 --- a/src/main/res/drawable/conversation_attachment_close_circle.xml +++ b/src/main/res/drawable/conversation_attachment_close_circle.xml @@ -2,14 +2,18 @@ - - - + + + - + diff --git a/src/main/res/drawable/conversation_attachment_edit.xml b/src/main/res/drawable/conversation_attachment_edit.xml index a72bb14ed..d1515d84a 100644 --- a/src/main/res/drawable/conversation_attachment_edit.xml +++ b/src/main/res/drawable/conversation_attachment_edit.xml @@ -2,15 +2,18 @@ - - + + - + diff --git a/src/main/res/drawable/conversation_item_background.xml b/src/main/res/drawable/conversation_item_background.xml index a1e2111d1..34c7a12a6 100644 --- a/src/main/res/drawable/conversation_item_background.xml +++ b/src/main/res/drawable/conversation_item_background.xml @@ -1,5 +1,9 @@ - - + + diff --git a/src/main/res/drawable/conversation_item_background_animated.xml b/src/main/res/drawable/conversation_item_background_animated.xml index 632882d7c..1bf8dfb5e 100644 --- a/src/main/res/drawable/conversation_item_background_animated.xml +++ b/src/main/res/drawable/conversation_item_background_animated.xml @@ -1,5 +1,11 @@ - - - + + + diff --git a/src/main/res/drawable/conversation_item_background_animated_blue.xml b/src/main/res/drawable/conversation_item_background_animated_blue.xml index d7af7cdbb..927ec9286 100644 --- a/src/main/res/drawable/conversation_item_background_animated_blue.xml +++ b/src/main/res/drawable/conversation_item_background_animated_blue.xml @@ -1,5 +1,11 @@ - - - + + + diff --git a/src/main/res/drawable/conversation_item_background_animated_gray.xml b/src/main/res/drawable/conversation_item_background_animated_gray.xml index 825fb3655..c069b7b29 100644 --- a/src/main/res/drawable/conversation_item_background_animated_gray.xml +++ b/src/main/res/drawable/conversation_item_background_animated_gray.xml @@ -1,5 +1,11 @@ - - - + + + diff --git a/src/main/res/drawable/conversation_item_background_animated_green.xml b/src/main/res/drawable/conversation_item_background_animated_green.xml index a1204f69d..1aad84f07 100644 --- a/src/main/res/drawable/conversation_item_background_animated_green.xml +++ b/src/main/res/drawable/conversation_item_background_animated_green.xml @@ -1,5 +1,11 @@ - - - + + + diff --git a/src/main/res/drawable/conversation_item_background_animated_pink.xml b/src/main/res/drawable/conversation_item_background_animated_pink.xml index eb8f54f85..1d7d7796a 100644 --- a/src/main/res/drawable/conversation_item_background_animated_pink.xml +++ b/src/main/res/drawable/conversation_item_background_animated_pink.xml @@ -1,5 +1,11 @@ - - - + + + diff --git a/src/main/res/drawable/conversation_item_background_animated_purple.xml b/src/main/res/drawable/conversation_item_background_animated_purple.xml index 319cf63bb..db8a24c64 100644 --- a/src/main/res/drawable/conversation_item_background_animated_purple.xml +++ b/src/main/res/drawable/conversation_item_background_animated_purple.xml @@ -1,5 +1,11 @@ - - - + + + diff --git a/src/main/res/drawable/conversation_item_background_animated_red.xml b/src/main/res/drawable/conversation_item_background_animated_red.xml index c4e9681b9..64325cc27 100644 --- a/src/main/res/drawable/conversation_item_background_animated_red.xml +++ b/src/main/res/drawable/conversation_item_background_animated_red.xml @@ -1,5 +1,11 @@ - - - + + + diff --git a/src/main/res/drawable/conversation_item_background_blue.xml b/src/main/res/drawable/conversation_item_background_blue.xml index 1660d3233..5a7cab587 100644 --- a/src/main/res/drawable/conversation_item_background_blue.xml +++ b/src/main/res/drawable/conversation_item_background_blue.xml @@ -1,5 +1,9 @@ - - + + diff --git a/src/main/res/drawable/conversation_item_background_gray.xml b/src/main/res/drawable/conversation_item_background_gray.xml index 2648813cb..d696cda75 100644 --- a/src/main/res/drawable/conversation_item_background_gray.xml +++ b/src/main/res/drawable/conversation_item_background_gray.xml @@ -1,5 +1,9 @@ - - + + diff --git a/src/main/res/drawable/conversation_item_background_green.xml b/src/main/res/drawable/conversation_item_background_green.xml index f0dc1d9bd..d85b5dde7 100644 --- a/src/main/res/drawable/conversation_item_background_green.xml +++ b/src/main/res/drawable/conversation_item_background_green.xml @@ -1,5 +1,9 @@ - - + + diff --git a/src/main/res/drawable/conversation_item_background_pink.xml b/src/main/res/drawable/conversation_item_background_pink.xml index 48b31c922..3d91394ee 100644 --- a/src/main/res/drawable/conversation_item_background_pink.xml +++ b/src/main/res/drawable/conversation_item_background_pink.xml @@ -1,5 +1,9 @@ - - + + diff --git a/src/main/res/drawable/conversation_item_background_purple.xml b/src/main/res/drawable/conversation_item_background_purple.xml index b0463a491..b4860321f 100644 --- a/src/main/res/drawable/conversation_item_background_purple.xml +++ b/src/main/res/drawable/conversation_item_background_purple.xml @@ -1,5 +1,9 @@ - - + + diff --git a/src/main/res/drawable/conversation_item_background_red.xml b/src/main/res/drawable/conversation_item_background_red.xml index 489892e73..0cd2471d4 100644 --- a/src/main/res/drawable/conversation_item_background_red.xml +++ b/src/main/res/drawable/conversation_item_background_red.xml @@ -1,5 +1,9 @@ - - + + diff --git a/src/main/res/drawable/conversation_item_sent_indicator_text_shape.xml b/src/main/res/drawable/conversation_item_sent_indicator_text_shape.xml index 59da5934a..9ebc6bb6f 100644 --- a/src/main/res/drawable/conversation_item_sent_indicator_text_shape.xml +++ b/src/main/res/drawable/conversation_item_sent_indicator_text_shape.xml @@ -2,7 +2,7 @@ - + @@ -11,7 +11,9 @@ - + diff --git a/src/main/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml b/src/main/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml index d02a39156..486b1a5d6 100644 --- a/src/main/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml +++ b/src/main/res/drawable/conversation_item_sent_indicator_text_shape_dark.xml @@ -2,7 +2,7 @@ - + @@ -11,7 +11,9 @@ - + diff --git a/src/main/res/drawable/conversation_item_update_background.xml b/src/main/res/drawable/conversation_item_update_background.xml index 6a7c72c11..1369cf36e 100644 --- a/src/main/res/drawable/conversation_item_update_background.xml +++ b/src/main/res/drawable/conversation_item_update_background.xml @@ -1,5 +1,6 @@ - diff --git a/src/main/res/drawable/conversation_list_item_background.xml b/src/main/res/drawable/conversation_list_item_background.xml index 82a85b420..cb0cd0c6a 100644 --- a/src/main/res/drawable/conversation_list_item_background.xml +++ b/src/main/res/drawable/conversation_list_item_background.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable/conversation_list_item_background_blue.xml b/src/main/res/drawable/conversation_list_item_background_blue.xml index b4b4d54a6..2b5854a01 100644 --- a/src/main/res/drawable/conversation_list_item_background_blue.xml +++ b/src/main/res/drawable/conversation_list_item_background_blue.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable/conversation_list_item_background_gray.xml b/src/main/res/drawable/conversation_list_item_background_gray.xml index 55e2c74fb..6296b1257 100644 --- a/src/main/res/drawable/conversation_list_item_background_gray.xml +++ b/src/main/res/drawable/conversation_list_item_background_gray.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable/conversation_list_item_background_green.xml b/src/main/res/drawable/conversation_list_item_background_green.xml index cd4e19115..a3db4bcec 100644 --- a/src/main/res/drawable/conversation_list_item_background_green.xml +++ b/src/main/res/drawable/conversation_list_item_background_green.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable/conversation_list_item_background_pink.xml b/src/main/res/drawable/conversation_list_item_background_pink.xml index 07e223232..3dc0266d6 100644 --- a/src/main/res/drawable/conversation_list_item_background_pink.xml +++ b/src/main/res/drawable/conversation_list_item_background_pink.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable/conversation_list_item_background_purple.xml b/src/main/res/drawable/conversation_list_item_background_purple.xml index 010a9a07e..a26253bce 100644 --- a/src/main/res/drawable/conversation_list_item_background_purple.xml +++ b/src/main/res/drawable/conversation_list_item_background_purple.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable/conversation_list_item_background_red.xml b/src/main/res/drawable/conversation_list_item_background_red.xml index 1a6dcfd4f..ede176b4a 100644 --- a/src/main/res/drawable/conversation_list_item_background_red.xml +++ b/src/main/res/drawable/conversation_list_item_background_red.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable/delete_account_item_background.xml b/src/main/res/drawable/delete_account_item_background.xml index 583b62b94..d55516f0e 100644 --- a/src/main/res/drawable/delete_account_item_background.xml +++ b/src/main/res/drawable/delete_account_item_background.xml @@ -1,5 +1,6 @@ - diff --git a/src/main/res/drawable/dismiss_background.xml b/src/main/res/drawable/dismiss_background.xml index d373de262..97addfaa3 100644 --- a/src/main/res/drawable/dismiss_background.xml +++ b/src/main/res/drawable/dismiss_background.xml @@ -1,5 +1,6 @@ - - + + diff --git a/src/main/res/drawable/divider_end.xml b/src/main/res/drawable/divider_end.xml index be4c65380..bd3c2460a 100644 --- a/src/main/res/drawable/divider_end.xml +++ b/src/main/res/drawable/divider_end.xml @@ -1,10 +1,11 @@ - + - + diff --git a/src/main/res/drawable/divider_start.xml b/src/main/res/drawable/divider_start.xml index 220c9aba0..7a31661ad 100644 --- a/src/main/res/drawable/divider_start.xml +++ b/src/main/res/drawable/divider_start.xml @@ -1,10 +1,11 @@ - + - + diff --git a/src/main/res/drawable/floating_mini_bg_dark.xml b/src/main/res/drawable/floating_mini_bg_dark.xml index 617e35d5e..4ad6b2c77 100644 --- a/src/main/res/drawable/floating_mini_bg_dark.xml +++ b/src/main/res/drawable/floating_mini_bg_dark.xml @@ -1,6 +1,7 @@ - + diff --git a/src/main/res/drawable/floating_mini_bg_light.xml b/src/main/res/drawable/floating_mini_bg_light.xml index 3b24b52c7..543d092a5 100644 --- a/src/main/res/drawable/floating_mini_bg_light.xml +++ b/src/main/res/drawable/floating_mini_bg_light.xml @@ -1,6 +1,7 @@ - + diff --git a/src/main/res/drawable/ic_advanced_24dp.xml b/src/main/res/drawable/ic_advanced_24dp.xml index 4fb9e1ab0..a3028d6f9 100644 --- a/src/main/res/drawable/ic_advanced_24dp.xml +++ b/src/main/res/drawable/ic_advanced_24dp.xml @@ -1,4 +1,5 @@ - + android:tint="?attr/pref_icon_tint" /> diff --git a/src/main/res/drawable/ic_alternate_email_24.xml b/src/main/res/drawable/ic_alternate_email_24.xml index e6182db41..505891890 100644 --- a/src/main/res/drawable/ic_alternate_email_24.xml +++ b/src/main/res/drawable/ic_alternate_email_24.xml @@ -1,5 +1,11 @@ - - + + diff --git a/src/main/res/drawable/ic_apps_24.xml b/src/main/res/drawable/ic_apps_24.xml index f578daeb2..b2427cca5 100644 --- a/src/main/res/drawable/ic_apps_24.xml +++ b/src/main/res/drawable/ic_apps_24.xml @@ -1,3 +1,11 @@ - - + + diff --git a/src/main/res/drawable/ic_baseline_devices_24.xml b/src/main/res/drawable/ic_baseline_devices_24.xml index 28a718506..b0e486b8b 100644 --- a/src/main/res/drawable/ic_baseline_devices_24.xml +++ b/src/main/res/drawable/ic_baseline_devices_24.xml @@ -1,5 +1,11 @@ - - + + diff --git a/src/main/res/drawable/ic_baseline_eye.xml b/src/main/res/drawable/ic_baseline_eye.xml index c74c5a758..94b4ec1ad 100644 --- a/src/main/res/drawable/ic_baseline_eye.xml +++ b/src/main/res/drawable/ic_baseline_eye.xml @@ -1,9 +1,10 @@ - - + diff --git a/src/main/res/drawable/ic_brightness_6_24dp.xml b/src/main/res/drawable/ic_brightness_6_24dp.xml index 548ad986f..aaa84c514 100644 --- a/src/main/res/drawable/ic_brightness_6_24dp.xml +++ b/src/main/res/drawable/ic_brightness_6_24dp.xml @@ -1,4 +1,5 @@ - + android:tint="?attr/pref_icon_tint" /> diff --git a/src/main/res/drawable/ic_chevron_up.xml b/src/main/res/drawable/ic_chevron_up.xml index c54db3bcc..97f0d74d8 100644 --- a/src/main/res/drawable/ic_chevron_up.xml +++ b/src/main/res/drawable/ic_chevron_up.xml @@ -1,9 +1,10 @@ - - + diff --git a/src/main/res/drawable/ic_delivery_status_failed.xml b/src/main/res/drawable/ic_delivery_status_failed.xml index fbd4009fd..8823caf0c 100644 --- a/src/main/res/drawable/ic_delivery_status_failed.xml +++ b/src/main/res/drawable/ic_delivery_status_failed.xml @@ -1,5 +1,11 @@ - - + + diff --git a/src/main/res/drawable/ic_donate_24dp.xml b/src/main/res/drawable/ic_donate_24dp.xml index 07ab6aae9..9020e3e22 100644 --- a/src/main/res/drawable/ic_donate_24dp.xml +++ b/src/main/res/drawable/ic_donate_24dp.xml @@ -1,3 +1,11 @@ - - + + diff --git a/src/main/res/drawable/ic_forum_24dp.xml b/src/main/res/drawable/ic_forum_24dp.xml index e48c05fd4..7318e8df8 100644 --- a/src/main/res/drawable/ic_forum_24dp.xml +++ b/src/main/res/drawable/ic_forum_24dp.xml @@ -1,4 +1,5 @@ - + android:tint="?attr/pref_icon_tint" /> diff --git a/src/main/res/drawable/ic_forward_white_24dp.xml b/src/main/res/drawable/ic_forward_white_24dp.xml index 4b84d9a42..3cdfcb028 100644 --- a/src/main/res/drawable/ic_forward_white_24dp.xml +++ b/src/main/res/drawable/ic_forward_white_24dp.xml @@ -1,3 +1,12 @@ - - + + diff --git a/src/main/res/drawable/ic_help_24dp.xml b/src/main/res/drawable/ic_help_24dp.xml index 66449b72f..b733dcf5f 100644 --- a/src/main/res/drawable/ic_help_24dp.xml +++ b/src/main/res/drawable/ic_help_24dp.xml @@ -1,4 +1,5 @@ - + android:tint="?attr/pref_icon_tint" /> diff --git a/src/main/res/drawable/ic_launcher_foreground.xml b/src/main/res/drawable/ic_launcher_foreground.xml index 22648ce29..13450c9e2 100644 --- a/src/main/res/drawable/ic_launcher_foreground.xml +++ b/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,17 +1,19 @@ - - - - - + + + + diff --git a/src/main/res/drawable/ic_launcher_foreground_monochrome.xml b/src/main/res/drawable/ic_launcher_foreground_monochrome.xml index 8ef65e2a8..213abaa99 100644 --- a/src/main/res/drawable/ic_launcher_foreground_monochrome.xml +++ b/src/main/res/drawable/ic_launcher_foreground_monochrome.xml @@ -1,15 +1,17 @@ - - - - + + + diff --git a/src/main/res/drawable/ic_link_24.xml b/src/main/res/drawable/ic_link_24.xml index 54d9934a3..a7164796d 100644 --- a/src/main/res/drawable/ic_link_24.xml +++ b/src/main/res/drawable/ic_link_24.xml @@ -1,8 +1,16 @@ - + - + diff --git a/src/main/res/drawable/ic_lock.xml b/src/main/res/drawable/ic_lock.xml index b642ae75e..94153f58b 100644 --- a/src/main/res/drawable/ic_lock.xml +++ b/src/main/res/drawable/ic_lock.xml @@ -1,9 +1,10 @@ - - + diff --git a/src/main/res/drawable/ic_lock_24dp.xml b/src/main/res/drawable/ic_lock_24dp.xml index da2a77be2..42a7b7d99 100644 --- a/src/main/res/drawable/ic_lock_24dp.xml +++ b/src/main/res/drawable/ic_lock_24dp.xml @@ -1,4 +1,5 @@ - + android:tint="?attr/pref_icon_tint" /> diff --git a/src/main/res/drawable/ic_map_white_24dp.xml b/src/main/res/drawable/ic_map_white_24dp.xml index efd6dc37e..56a0c3b90 100644 --- a/src/main/res/drawable/ic_map_white_24dp.xml +++ b/src/main/res/drawable/ic_map_white_24dp.xml @@ -1,5 +1,11 @@ - - + + diff --git a/src/main/res/drawable/ic_notifications_24dp.xml b/src/main/res/drawable/ic_notifications_24dp.xml index 56cd14d7a..9788adcc3 100644 --- a/src/main/res/drawable/ic_notifications_24dp.xml +++ b/src/main/res/drawable/ic_notifications_24dp.xml @@ -1,4 +1,5 @@ - + android:tint="?attr/pref_icon_tint" /> diff --git a/src/main/res/drawable/ic_outline_email.xml b/src/main/res/drawable/ic_outline_email.xml index 19ab62ba4..9d0a435c2 100644 --- a/src/main/res/drawable/ic_outline_email.xml +++ b/src/main/res/drawable/ic_outline_email.xml @@ -6,6 +6,8 @@ android:viewportWidth="24" android:tint="#FFFFFF"> - + - \ No newline at end of file + diff --git a/src/main/res/drawable/ic_person_large.xml b/src/main/res/drawable/ic_person_large.xml index c3324be1d..2c9b9ecbe 100644 --- a/src/main/res/drawable/ic_person_large.xml +++ b/src/main/res/drawable/ic_person_large.xml @@ -1,4 +1,10 @@ - - + + diff --git a/src/main/res/drawable/ic_proxy_disabled_24.xml b/src/main/res/drawable/ic_proxy_disabled_24.xml index 287bc46d2..290bdf840 100644 --- a/src/main/res/drawable/ic_proxy_disabled_24.xml +++ b/src/main/res/drawable/ic_proxy_disabled_24.xml @@ -1,5 +1,13 @@ - - - - + + + + diff --git a/src/main/res/drawable/ic_proxy_enabled_24.xml b/src/main/res/drawable/ic_proxy_enabled_24.xml index 81c20e883..c559c67de 100644 --- a/src/main/res/drawable/ic_proxy_enabled_24.xml +++ b/src/main/res/drawable/ic_proxy_enabled_24.xml @@ -1,5 +1,13 @@ - - - - + + + + diff --git a/src/main/res/drawable/ic_qr_code_24.xml b/src/main/res/drawable/ic_qr_code_24.xml index f95c18d61..f5ca18c7e 100644 --- a/src/main/res/drawable/ic_qr_code_24.xml +++ b/src/main/res/drawable/ic_qr_code_24.xml @@ -1,3 +1,11 @@ - - + + diff --git a/src/main/res/drawable/ic_qr_code_scanner_24.xml b/src/main/res/drawable/ic_qr_code_scanner_24.xml index 725b35ea7..5164cc16a 100644 --- a/src/main/res/drawable/ic_qr_code_scanner_24.xml +++ b/src/main/res/drawable/ic_qr_code_scanner_24.xml @@ -1,5 +1,13 @@ - + - + diff --git a/src/main/res/drawable/ic_share_white_24dp.xml b/src/main/res/drawable/ic_share_white_24dp.xml index 045bbc0c0..02eea7642 100644 --- a/src/main/res/drawable/ic_share_white_24dp.xml +++ b/src/main/res/drawable/ic_share_white_24dp.xml @@ -1,5 +1,11 @@ - - + + diff --git a/src/main/res/drawable/ic_swap_vert_24dp.xml b/src/main/res/drawable/ic_swap_vert_24dp.xml index c54dc343d..a67392a3d 100644 --- a/src/main/res/drawable/ic_swap_vert_24dp.xml +++ b/src/main/res/drawable/ic_swap_vert_24dp.xml @@ -1,4 +1,5 @@ - + android:tint="?attr/pref_icon_tint" /> diff --git a/src/main/res/drawable/ic_timer_gray_18dp.xml b/src/main/res/drawable/ic_timer_gray_18dp.xml index 52a5c9218..3ca1d3e82 100644 --- a/src/main/res/drawable/ic_timer_gray_18dp.xml +++ b/src/main/res/drawable/ic_timer_gray_18dp.xml @@ -1,5 +1,11 @@ - - + + diff --git a/src/main/res/drawable/ic_verified.xml b/src/main/res/drawable/ic_verified.xml index c8b706df6..280717156 100644 --- a/src/main/res/drawable/ic_verified.xml +++ b/src/main/res/drawable/ic_verified.xml @@ -1,8 +1,16 @@ - - + - + android:strokeColor="#00000000" + android:strokeWidth="206.103" /> + diff --git a/src/main/res/drawable/ic_videocam_white_24dp.xml b/src/main/res/drawable/ic_videocam_white_24dp.xml index f75fa71ae..552a06766 100644 --- a/src/main/res/drawable/ic_videocam_white_24dp.xml +++ b/src/main/res/drawable/ic_videocam_white_24dp.xml @@ -1,5 +1,11 @@ - - + + diff --git a/src/main/res/drawable/image_shade.xml b/src/main/res/drawable/image_shade.xml index 07a18cb4d..54993da2b 100644 --- a/src/main/res/drawable/image_shade.xml +++ b/src/main/res/drawable/image_shade.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/src/main/res/drawable/jumpto_btn_bg.xml b/src/main/res/drawable/jumpto_btn_bg.xml index 82142dd34..3c8344cd4 100644 --- a/src/main/res/drawable/jumpto_btn_bg.xml +++ b/src/main/res/drawable/jumpto_btn_bg.xml @@ -1,5 +1,6 @@ - - + + diff --git a/src/main/res/drawable/message_bubble_background_received_alone.xml b/src/main/res/drawable/message_bubble_background_received_alone.xml index 196688a09..19e7ea2f1 100644 --- a/src/main/res/drawable/message_bubble_background_received_alone.xml +++ b/src/main/res/drawable/message_bubble_background_received_alone.xml @@ -1,6 +1,5 @@ - + diff --git a/src/main/res/drawable/message_bubble_background_sent_alone.xml b/src/main/res/drawable/message_bubble_background_sent_alone.xml index fff6b14b6..cfe5181cc 100644 --- a/src/main/res/drawable/message_bubble_background_sent_alone.xml +++ b/src/main/res/drawable/message_bubble_background_sent_alone.xml @@ -1,6 +1,5 @@ - + diff --git a/src/main/res/drawable/message_bubble_background_sent_alone_with_border.xml b/src/main/res/drawable/message_bubble_background_sent_alone_with_border.xml index e8ac29c9a..713b86bc6 100644 --- a/src/main/res/drawable/message_bubble_background_sent_alone_with_border.xml +++ b/src/main/res/drawable/message_bubble_background_sent_alone_with_border.xml @@ -1,11 +1,12 @@ - + - + + android:strokeMiterLimit="10" /> + android:strokeMiterLimit="10" /> - \ No newline at end of file + diff --git a/src/main/res/drawable/pause_to_play_animation.xml b/src/main/res/drawable/pause_to_play_animation.xml index aa010cee9..d359bd161 100644 --- a/src/main/res/drawable/pause_to_play_animation.xml +++ b/src/main/res/drawable/pause_to_play_animation.xml @@ -1,16 +1,17 @@ - + android:animation="@animator/rotate_minus_90_animation" /> + android:animation="@animator/upper_pause_to_play_animation" /> + android:animation="@animator/bottom_pause_to_play_animation" /> diff --git a/src/main/res/drawable/pinned_list_item_background.xml b/src/main/res/drawable/pinned_list_item_background.xml index 0df99189d..01d71cee9 100644 --- a/src/main/res/drawable/pinned_list_item_background.xml +++ b/src/main/res/drawable/pinned_list_item_background.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable/pinned_list_item_background_blue.xml b/src/main/res/drawable/pinned_list_item_background_blue.xml index ca3c9c8fd..2924a9475 100644 --- a/src/main/res/drawable/pinned_list_item_background_blue.xml +++ b/src/main/res/drawable/pinned_list_item_background_blue.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable/pinned_list_item_background_gray.xml b/src/main/res/drawable/pinned_list_item_background_gray.xml index ae332ca2f..b8cc3a41f 100644 --- a/src/main/res/drawable/pinned_list_item_background_gray.xml +++ b/src/main/res/drawable/pinned_list_item_background_gray.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable/pinned_list_item_background_green.xml b/src/main/res/drawable/pinned_list_item_background_green.xml index 3264071d4..19105d3fd 100644 --- a/src/main/res/drawable/pinned_list_item_background_green.xml +++ b/src/main/res/drawable/pinned_list_item_background_green.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable/pinned_list_item_background_pink.xml b/src/main/res/drawable/pinned_list_item_background_pink.xml index 7279114a9..1becb7b0c 100644 --- a/src/main/res/drawable/pinned_list_item_background_pink.xml +++ b/src/main/res/drawable/pinned_list_item_background_pink.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable/pinned_list_item_background_purple.xml b/src/main/res/drawable/pinned_list_item_background_purple.xml index 5761632a4..2c86c1070 100644 --- a/src/main/res/drawable/pinned_list_item_background_purple.xml +++ b/src/main/res/drawable/pinned_list_item_background_purple.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable/pinned_list_item_background_red.xml b/src/main/res/drawable/pinned_list_item_background_red.xml index 0e30584d4..7310639ad 100644 --- a/src/main/res/drawable/pinned_list_item_background_red.xml +++ b/src/main/res/drawable/pinned_list_item_background_red.xml @@ -1,10 +1,15 @@ - - + + - + diff --git a/src/main/res/drawable/play_icon.xml b/src/main/res/drawable/play_icon.xml index 7472ac7de..ea4da4c40 100644 --- a/src/main/res/drawable/play_icon.xml +++ b/src/main/res/drawable/play_icon.xml @@ -18,7 +18,7 @@ android:fillColor="@android:color/white" android:strokeLineCap="butt" android:strokeLineJoin="miter" - android:strokeMiterLimit="10"/> + android:strokeMiterLimit="10" /> + android:strokeMiterLimit="10" /> - \ No newline at end of file + diff --git a/src/main/res/drawable/play_to_pause_animation.xml b/src/main/res/drawable/play_to_pause_animation.xml index 173fed50f..3c7a99a06 100644 --- a/src/main/res/drawable/play_to_pause_animation.xml +++ b/src/main/res/drawable/play_to_pause_animation.xml @@ -1,16 +1,17 @@ - + android:animation="@animator/rotate_90_animation" /> + android:animation="@animator/upper_play_to_pause_animation" /> + android:animation="@animator/bottom_play_to_pause_animation" /> diff --git a/src/main/res/drawable/reaction_pill_background.xml b/src/main/res/drawable/reaction_pill_background.xml index bad81d54c..6e4faca03 100644 --- a/src/main/res/drawable/reaction_pill_background.xml +++ b/src/main/res/drawable/reaction_pill_background.xml @@ -2,5 +2,7 @@ - + diff --git a/src/main/res/drawable/reaction_pill_background_selected.xml b/src/main/res/drawable/reaction_pill_background_selected.xml index b52af9b3d..af768f065 100644 --- a/src/main/res/drawable/reaction_pill_background_selected.xml +++ b/src/main/res/drawable/reaction_pill_background_selected.xml @@ -2,5 +2,7 @@ - + diff --git a/src/main/res/drawable/recording_lock_background_dark.xml b/src/main/res/drawable/recording_lock_background_dark.xml index 5dda37904..7be556aee 100644 --- a/src/main/res/drawable/recording_lock_background_dark.xml +++ b/src/main/res/drawable/recording_lock_background_dark.xml @@ -3,10 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - + - + diff --git a/src/main/res/drawable/recording_lock_background_light.xml b/src/main/res/drawable/recording_lock_background_light.xml index d2e3a753e..929a5fa79 100644 --- a/src/main/res/drawable/recording_lock_background_light.xml +++ b/src/main/res/drawable/recording_lock_background_light.xml @@ -3,10 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - + - + diff --git a/src/main/res/drawable/rounded_arrow_forward_24.xml b/src/main/res/drawable/rounded_arrow_forward_24.xml index 29b2576d4..d48d0e596 100644 --- a/src/main/res/drawable/rounded_arrow_forward_24.xml +++ b/src/main/res/drawable/rounded_arrow_forward_24.xml @@ -1,3 +1,12 @@ - - + + diff --git a/src/main/res/drawable/search_toolbar_shadow.xml b/src/main/res/drawable/search_toolbar_shadow.xml index 5afdc2a2d..f4bc37dea 100644 --- a/src/main/res/drawable/search_toolbar_shadow.xml +++ b/src/main/res/drawable/search_toolbar_shadow.xml @@ -1,7 +1,8 @@ - + - \ No newline at end of file + android:startColor="@android:color/transparent" + android:endColor="#40000000" + android:angle="90" /> + diff --git a/src/main/res/drawable/send_button_bg.xml b/src/main/res/drawable/send_button_bg.xml index 128666193..3fe9e7a11 100644 --- a/src/main/res/drawable/send_button_bg.xml +++ b/src/main/res/drawable/send_button_bg.xml @@ -1,5 +1,6 @@ - + diff --git a/src/main/res/drawable/sticky_date_header_background_dark.xml b/src/main/res/drawable/sticky_date_header_background_dark.xml index d5be2c288..93db9138a 100644 --- a/src/main/res/drawable/sticky_date_header_background_dark.xml +++ b/src/main/res/drawable/sticky_date_header_background_dark.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/src/main/res/drawable/sticky_date_header_background_light.xml b/src/main/res/drawable/sticky_date_header_background_light.xml index b015b381b..b1415dd9c 100644 --- a/src/main/res/drawable/sticky_date_header_background_light.xml +++ b/src/main/res/drawable/sticky_date_header_background_light.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/src/main/res/drawable/touch_highlight_background.xml b/src/main/res/drawable/touch_highlight_background.xml index 3c7a58ba7..73163d3a6 100644 --- a/src/main/res/drawable/touch_highlight_background.xml +++ b/src/main/res/drawable/touch_highlight_background.xml @@ -1,5 +1,6 @@ - - + android:fillColor="#ffffff" /> diff --git a/src/main/res/layout-land/conversation_activity_emojidrawer_stub.xml b/src/main/res/layout-land/conversation_activity_emojidrawer_stub.xml index 9417360bf..de98aff34 100644 --- a/src/main/res/layout-land/conversation_activity_emojidrawer_stub.xml +++ b/src/main/res/layout-land/conversation_activity_emojidrawer_stub.xml @@ -1,18 +1,18 @@ + + - - + android:layout_height="match_parent" + android:background="?emoji_drawer_background" + app:emojiGridColumns="12" /> diff --git a/src/main/res/layout-land/reaction_picker.xml b/src/main/res/layout-land/reaction_picker.xml index 0115e91fa..39294de5e 100644 --- a/src/main/res/layout-land/reaction_picker.xml +++ b/src/main/res/layout-land/reaction_picker.xml @@ -10,5 +10,5 @@ android:id="@+id/emoji_picker" android:layout_width="match_parent" android:layout_height="match_parent" - app:emojiGridColumns="10"/> + app:emojiGridColumns="10" /> diff --git a/src/main/res/layout/account_selection_list_fragment.xml b/src/main/res/layout/account_selection_list_fragment.xml index dfe5274fa..b5200d2a4 100644 --- a/src/main/res/layout/account_selection_list_fragment.xml +++ b/src/main/res/layout/account_selection_list_fragment.xml @@ -1,7 +1,8 @@ - + diff --git a/src/main/res/layout/account_selection_list_item.xml b/src/main/res/layout/account_selection_list_item.xml index 0192093b8..66a05adaa 100644 --- a/src/main/res/layout/account_selection_list_item.xml +++ b/src/main/res/layout/account_selection_list_item.xml @@ -1,40 +1,41 @@ + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="60dp" + android:orientation="horizontal" + android:gravity="center_vertical" + android:focusable="true" + android:background="?attr/conversation_list_item_background" + android:paddingLeft="16dp" + android:paddingStart="16dp"> + android:id="@+id/contact_photo_image" + android:layout_width="40dp" + android:layout_height="40dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + android:contentDescription="@null" /> - + - - + - + - + + android:paddingEnd="16dp" /> diff --git a/src/main/res/layout/activity_application_preferences.xml b/src/main/res/layout/activity_application_preferences.xml index acddaa01c..9263e45bf 100644 --- a/src/main/res/layout/activity_application_preferences.xml +++ b/src/main/res/layout/activity_application_preferences.xml @@ -4,11 +4,11 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + - + diff --git a/src/main/res/layout/activity_blocked_contacts.xml b/src/main/res/layout/activity_blocked_contacts.xml index acddaa01c..9263e45bf 100644 --- a/src/main/res/layout/activity_blocked_contacts.xml +++ b/src/main/res/layout/activity_blocked_contacts.xml @@ -4,11 +4,11 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + - + diff --git a/src/main/res/layout/activity_conversation_list_archive.xml b/src/main/res/layout/activity_conversation_list_archive.xml index acddaa01c..9263e45bf 100644 --- a/src/main/res/layout/activity_conversation_list_archive.xml +++ b/src/main/res/layout/activity_conversation_list_archive.xml @@ -4,11 +4,11 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + - + diff --git a/src/main/res/layout/activity_edittransport.xml b/src/main/res/layout/activity_edittransport.xml index 3e393d856..668d33dc2 100644 --- a/src/main/res/layout/activity_edittransport.xml +++ b/src/main/res/layout/activity_edittransport.xml @@ -7,392 +7,389 @@ android:layout_height="match_parent" tools:context=".EditTransportActivity"> - + - - - - - - - - - + + - - - - - - + + + + + + + + + + + + + + + + + app:layout_constraintEnd_toEndOf="@id/guideline_root_end" + app:layout_constraintStart_toStartOf="@id/guideline_root_start" + app:layout_constraintTop_toBottomOf="@id/email"> - + - + - - - - - + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_marginTop="12dp" + android:orientation="vertical" + android:visibility="gone" + app:layout_constraintTop_toBottomOf="@id/password"> + + + + + + + + + android:visibility="gone" + tools:visibility="visible" + app:constraint_referenced_ids="inbox, imap_login, imap_server, imap_port, imap_security_label, imap_security, outbox_view_spacer_top, + outbox, smtp_login, smtp_password, smtp_server, smtp_port, smtp_security_label, smtp_security, cert_check_label, cert_check, view_log_button, proxy_settings" /> + + + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toEndOf="@id/advanced_icon" + app:layout_constraintTop_toBottomOf="@id/no_servers_hint" /> - - - - - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + - - - - - - + + + + + + - - + app:layout_constraintEnd_toEndOf="@id/guideline_root_end" + app:layout_constraintStart_toStartOf="@id/guideline_root_start" + app:layout_constraintTop_toBottomOf="@id/smtp_login"> + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + android:text="@string/login_smtp_security" + app:layout_constraintEnd_toEndOf="@id/guideline_root_end" + app:layout_constraintStart_toStartOf="@id/guideline_root_start" + app:layout_constraintTop_toBottomOf="@id/smtp_port" /> + + - - - - - - - - - - - - - - - + + + + + android:text="@string/pref_view_log" + android:textColor="?attr/colorAccent" + android:textSize="16sp" + android:textStyle="normal" + android:typeface="sans" + android:paddingTop="16dp" + android:paddingBottom="32dp" + app:layout_constraintEnd_toEndOf="@id/guideline_root_end" + app:layout_constraintStart_toStartOf="@id/guideline_root_start" + app:layout_constraintTop_toBottomOf="@id/cert_check" /> - + - - - - - - - - - - - - - + diff --git a/src/main/res/layout/activity_qr.xml b/src/main/res/layout/activity_qr.xml index 68530d76c..e62a9e388 100644 --- a/src/main/res/layout/activity_qr.xml +++ b/src/main/res/layout/activity_qr.xml @@ -18,7 +18,7 @@ app:contentInsetStart="14dp" app:contentInsetLeft="14dp" android:elevation="4dp" - android:theme="?attr/actionBarStyle"/> + android:theme="?attr/actionBarStyle" /> + app:tabSelectedTextColor="@color/white" /> @@ -41,6 +41,6 @@ android:id="@+id/pager" android:layout_width="match_parent" android:layout_height="match_parent" - app:layout_behavior="@string/appbar_scrolling_view_behavior"/> + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> diff --git a/src/main/res/layout/activity_qr_show.xml b/src/main/res/layout/activity_qr_show.xml index 473de0968..33dda999e 100644 --- a/src/main/res/layout/activity_qr_show.xml +++ b/src/main/res/layout/activity_qr_show.xml @@ -4,12 +4,13 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + - + diff --git a/src/main/res/layout/activity_registration_2nd_device_qr.xml b/src/main/res/layout/activity_registration_2nd_device_qr.xml index 01241e2b5..b5c237638 100644 --- a/src/main/res/layout/activity_registration_2nd_device_qr.xml +++ b/src/main/res/layout/activity_registration_2nd_device_qr.xml @@ -7,7 +7,7 @@ android:orientation="vertical" android:gravity="center_horizontal"> - + + android:textSize="16sp" /> + android:textSize="16sp" /> + android:textSize="16sp" /> + android:textSize="16sp" /> @@ -65,7 +65,7 @@ + android:layout_height="0dp" /> + android:layout_height="0dp" /> diff --git a/src/main/res/layout/activity_registration_qr.xml b/src/main/res/layout/activity_registration_qr.xml index 95880e3da..54887db3a 100644 --- a/src/main/res/layout/activity_registration_qr.xml +++ b/src/main/res/layout/activity_registration_qr.xml @@ -7,12 +7,12 @@ android:orientation="vertical" android:gravity="center_horizontal"> - + + android:layout_height="0dp" /> + android:layout_height="0dp" /> diff --git a/src/main/res/layout/activity_relay_list.xml b/src/main/res/layout/activity_relay_list.xml index 243fc3ccb..44a6bf55b 100644 --- a/src/main/res/layout/activity_relay_list.xml +++ b/src/main/res/layout/activity_relay_list.xml @@ -6,26 +6,26 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + - + - + diff --git a/src/main/res/layout/activity_select_chat_background.xml b/src/main/res/layout/activity_select_chat_background.xml index e61fb0b58..16df3fa71 100644 --- a/src/main/res/layout/activity_select_chat_background.xml +++ b/src/main/res/layout/activity_select_chat_background.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_height="match_parent" + android:layout_width="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto"> + android:layout_width="match_parent" + android:layout_height="wrap_content"> + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + android:minHeight="?attr/actionBarSize" + android:background="?attr/colorPrimary" + app:contentInsetStart="14dp" + app:contentInsetLeft="14dp" + android:elevation="4dp" + android:theme="?attr/actionBarStyle" /> + android:id="@+id/tab_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:elevation="4dp" + android:layout_gravity="top" + android:background="?attr/colorPrimary" + app:tabMode="scrollable" + app:tabPaddingStart="8dp" + app:tabPaddingEnd="8dp" + app:tabBackground="?attr/colorPrimary" + app:tabIndicatorColor="@color/white" + app:tabTextColor="@color/gray10" + app:tabSelectedTextColor="@color/white" /> + android:id="@+id/pager" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> diff --git a/src/main/res/layout/attachment_type_selector.xml b/src/main/res/layout/attachment_type_selector.xml index 2afa0402e..eaaeca1f7 100644 --- a/src/main/res/layout/attachment_type_selector.xml +++ b/src/main/res/layout/attachment_type_selector.xml @@ -1,25 +1,28 @@ - - - - - + + + + + + android:id="@+id/recent_photos" + android:layout_width="match_parent" + android:layout_height="160dp" + android:padding="4dp" /> + app:circleColor="#00FFFFFF" /> + android:text="@string/video" /> @@ -79,7 +82,7 @@ android:src="@drawable/ic_image_white_24dp" android:scaleType="center" android:contentDescription="@string/gallery" - app:circleColor="@color/gallery_icon"/> + app:circleColor="@color/gallery_icon" /> + android:text="@string/gallery" /> @@ -108,7 +111,7 @@ android:src="@drawable/ic_insert_drive_file_white_24dp" android:scaleType="center" android:contentDescription="@string/file" - app:circleColor="@color/document_icon"/> + app:circleColor="@color/document_icon" /> + android:text="@string/file" /> @@ -137,7 +140,7 @@ android:src="@drawable/ic_apps_24" android:scaleType="center" android:contentDescription="@string/webxdc_app" - app:circleColor="@color/apps_icon"/> + app:circleColor="@color/apps_icon" /> + android:text="@string/webxdc_app" /> @@ -166,7 +169,7 @@ android:src="@drawable/ic_person_white_24dp" android:scaleType="center" android:contentDescription="@string/contact" - app:circleColor="@color/contact_icon"/> + app:circleColor="@color/contact_icon" /> + android:text="@string/contact" /> @@ -197,7 +200,7 @@ android:scaleType="center" android:visibility="visible" android:contentDescription="@string/location" - app:circleColor="@color/location_icon"/> + app:circleColor="@color/location_icon" /> + android:text="@string/location" /> diff --git a/src/main/res/layout/audio_view.xml b/src/main/res/layout/audio_view.xml index 7be81f6ed..770e1b951 100644 --- a/src/main/res/layout/audio_view.xml +++ b/src/main/res/layout/audio_view.xml @@ -1,73 +1,81 @@ - + - + - + - + - + - + - + - + diff --git a/src/main/res/layout/avatar_selector.xml b/src/main/res/layout/avatar_selector.xml index 32f96bc2d..94d07abc0 100644 --- a/src/main/res/layout/avatar_selector.xml +++ b/src/main/res/layout/avatar_selector.xml @@ -1,136 +1,147 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/res/layout/avatar_view.xml b/src/main/res/layout/avatar_view.xml index cb28e84dc..53e2b7947 100644 --- a/src/main/res/layout/avatar_view.xml +++ b/src/main/res/layout/avatar_view.xml @@ -8,13 +8,13 @@ tools:parentTag="org.thoughtcrime.securesms.components.AvatarView"> + android:id="@+id/avatar_image" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:foreground="@drawable/contact_photo_background" + android:cropToPadding="true" + tools:src="@color/blue_600" + android:contentDescription="@null" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/start_guideline" + app:layout_constraintGuide_percent=".69" + android:orientation="vertical" /> - + diff --git a/src/main/res/layout/backup_provider_activity.xml b/src/main/res/layout/backup_provider_activity.xml index af418cf29..a6da0b67d 100644 --- a/src/main/res/layout/backup_provider_activity.xml +++ b/src/main/res/layout/backup_provider_activity.xml @@ -4,12 +4,12 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + - + diff --git a/src/main/res/layout/backup_provider_fragment.xml b/src/main/res/layout/backup_provider_fragment.xml index 1dcb83823..0d2f8e7dd 100644 --- a/src/main/res/layout/backup_provider_fragment.xml +++ b/src/main/res/layout/backup_provider_fragment.xml @@ -1,112 +1,112 @@ - + - + - + - + - - - - + + + + - - - - + + + + - - - - + + + + - + - + diff --git a/src/main/res/layout/backup_receiver_fragment.xml b/src/main/res/layout/backup_receiver_fragment.xml index 14e5ac473..4bd0c6439 100644 --- a/src/main/res/layout/backup_receiver_fragment.xml +++ b/src/main/res/layout/backup_receiver_fragment.xml @@ -1,38 +1,38 @@ - + - + - + - + diff --git a/src/main/res/layout/call_item_view.xml b/src/main/res/layout/call_item_view.xml index 32aea6633..cb327ea5a 100644 --- a/src/main/res/layout/call_item_view.xml +++ b/src/main/res/layout/call_item_view.xml @@ -9,41 +9,40 @@ android:gravity="center_vertical" android:focusable="true"> - - - + android:layout_weight="1" + android:layout_marginEnd="16dp" + android:orientation="vertical"> - + + + - + - + diff --git a/src/main/res/layout/contact_filter_toolbar.xml b/src/main/res/layout/contact_filter_toolbar.xml index 94237fcef..48e60aba7 100644 --- a/src/main/res/layout/contact_filter_toolbar.xml +++ b/src/main/res/layout/contact_filter_toolbar.xml @@ -1,14 +1,16 @@ - + - + - + diff --git a/src/main/res/layout/contact_selection_activity.xml b/src/main/res/layout/contact_selection_activity.xml index d32366fdf..9b7662922 100644 --- a/src/main/res/layout/contact_selection_activity.xml +++ b/src/main/res/layout/contact_selection_activity.xml @@ -1,24 +1,26 @@ - + + android:id="@+id/toolbar" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:minHeight="?attr/actionBarSize" + android:background="?attr/colorPrimary" + android:elevation="4dp" + android:theme="?attr/actionBarStyle" + app:contentInsetStartWithNavigation="0dp" /> - + diff --git a/src/main/res/layout/contact_selection_list_divider.xml b/src/main/res/layout/contact_selection_list_divider.xml index f0e6a54d0..8eab9aa2f 100644 --- a/src/main/res/layout/contact_selection_list_divider.xml +++ b/src/main/res/layout/contact_selection_list_divider.xml @@ -1,20 +1,22 @@ - + - + - \ No newline at end of file + diff --git a/src/main/res/layout/contact_selection_list_fragment.xml b/src/main/res/layout/contact_selection_list_fragment.xml index 15323ff69..8cdb6e134 100644 --- a/src/main/res/layout/contact_selection_list_fragment.xml +++ b/src/main/res/layout/contact_selection_list_fragment.xml @@ -1,24 +1,26 @@ - + - + - + diff --git a/src/main/res/layout/contact_selection_list_item.xml b/src/main/res/layout/contact_selection_list_item.xml index 7670373c2..6452b804a 100644 --- a/src/main/res/layout/contact_selection_list_item.xml +++ b/src/main/res/layout/contact_selection_list_item.xml @@ -1,29 +1,30 @@ + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="60dp" + android:orientation="horizontal" + android:gravity="center_vertical" + android:focusable="true" + android:background="?attr/conversation_list_item_background" + android:paddingLeft="16dp" + android:paddingRight="16dp"> + android:id="@+id/avatar" + android:layout_width="40dp" + android:layout_height="40dp" /> - + - - + - + - + - + diff --git a/src/main/res/layout/conversation_activity.xml b/src/main/res/layout/conversation_activity.xml index 434bd3568..041773310 100644 --- a/src/main/res/layout/conversation_activity.xml +++ b/src/main/res/layout/conversation_activity.xml @@ -4,9 +4,10 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/root_layout" android:background="?attr/input_panel_bg_color" - android:layout_height="match_parent" android:layout_width="match_parent"> + android:layout_height="match_parent" + android:layout_width="match_parent"> - + + android:id="@+id/layout_container" + android:layout_width="match_parent" + android:layout_height="match_parent"> - + - + + android:id="@+id/attachment_editor_stub" + android:inflatedId="@+id/attachment_editor" + android:layout="@layout/conversation_activity_attachment_editor_stub" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> - + + android:layout_height="wrap_content" /> diff --git a/src/main/res/layout/conversation_activity_attachment_editor_stub.xml b/src/main/res/layout/conversation_activity_attachment_editor_stub.xml index 33087a412..3eb442b4d 100644 --- a/src/main/res/layout/conversation_activity_attachment_editor_stub.xml +++ b/src/main/res/layout/conversation_activity_attachment_editor_stub.xml @@ -1,87 +1,81 @@ - + + android:id="@+id/removable_media_view" + android:paddingBottom="12dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center"> - + + android:id="@+id/attachment_thumbnail" + android:layout_width="230dp" + android:layout_height="150dp" + android:layout_gravity="center_horizontal" + android:visibility="gone" + android:contentDescription="@string/menu_add_attachment" + app:thumbnail_radius="@dimen/message_corner_radius" + app:minWidth="100dp" + app:maxWidth="300dp" + app:minHeight="100dp" + app:maxHeight="300dp" /> + android:id="@+id/attachment_audio" + android:layout_width="230dp" + android:layout_height="wrap_content" + android:visibility="gone" + android:layout_marginTop="10dp" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:padding="8dp" + android:background="@drawable/message_bubble_background_sent_alone_with_border" /> + android:id="@+id/attachment_document" + android:layout_width="230dp" + android:layout_height="wrap_content" + android:visibility="gone" + android:layout_marginTop="10dp" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:padding="8dp" + android:background="@drawable/message_bubble_background_sent_alone_with_border" /> + android:id="@+id/attachment_webxdc" + android:layout_width="230dp" + android:layout_height="wrap_content" + android:visibility="gone" + android:layout_marginTop="10dp" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:padding="8dp" + android:background="@drawable/message_bubble_background_sent_alone_with_border" /> + android:id="@+id/attachment_vcard" + android:layout_width="230dp" + android:layout_height="wrap_content" + android:visibility="gone" + android:layout_marginTop="10dp" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:padding="8dp" + android:background="@drawable/message_bubble_background_sent_alone_with_border" /> - diff --git a/src/main/res/layout/conversation_activity_emojidrawer_stub.xml b/src/main/res/layout/conversation_activity_emojidrawer_stub.xml index 742adefaf..b1824881a 100644 --- a/src/main/res/layout/conversation_activity_emojidrawer_stub.xml +++ b/src/main/res/layout/conversation_activity_emojidrawer_stub.xml @@ -1,19 +1,19 @@ + + - - + android:layout_height="match_parent" + android:background="?emoji_drawer_background" + app:emojiGridColumns="9" /> diff --git a/src/main/res/layout/conversation_fragment.xml b/src/main/res/layout/conversation_fragment.xml index 1990b6d07..4b86ec65e 100644 --- a/src/main/res/layout/conversation_fragment.xml +++ b/src/main/res/layout/conversation_fragment.xml @@ -1,20 +1,21 @@ - + + android:id="@android:id/list" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingBottom="8dp" + android:scrollbars="vertical" + android:cacheColorHint="?conversation_background" + android:clipChildren="false" + android:clipToPadding="false" /> + tools:text="@string/chat_new_one_to_one_hint" /> + android:layout_height="2dp" + android:layout_gravity="bottom" + android:background="@drawable/compose_divider_background" + android:alpha="1" /> + android:tint="@color/location_icon" /> + android:src="@drawable/ic_search_down" /> + style="@style/AddReaction" /> + style="@style/AddReaction" /> + style="@style/AddReaction" /> + style="@style/AddReaction" /> + style="@style/AddReaction" /> + style="@style/AddReaction" /> diff --git a/src/main/res/layout/conversation_input_panel.xml b/src/main/res/layout/conversation_input_panel.xml index 03aafc764..2a8b5df98 100644 --- a/src/main/res/layout/conversation_input_panel.xml +++ b/src/main/res/layout/conversation_input_panel.xml @@ -88,7 +88,7 @@ android:nextFocusForward="@+id/send_button" android:nextFocusRight="@+id/send_button" tools:visibility="invisible" - tools:hint="Send message" > + tools:hint="Send message"> @@ -122,7 +122,7 @@ android:clipChildren="false" android:clipToPadding="false"> - + @@ -130,7 +130,7 @@ - + diff --git a/src/main/res/layout/conversation_item_call.xml b/src/main/res/layout/conversation_item_call.xml index 15a28934f..462433a29 100644 --- a/src/main/res/layout/conversation_item_call.xml +++ b/src/main/res/layout/conversation_item_call.xml @@ -1,9 +1,9 @@ + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/call_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" + tools:visibility="visible" /> diff --git a/src/main/res/layout/conversation_item_received.xml b/src/main/res/layout/conversation_item_received.xml index 2e3e5d2a9..c65a39673 100644 --- a/src/main/res/layout/conversation_item_received.xml +++ b/src/main/res/layout/conversation_item_received.xml @@ -13,265 +13,263 @@ android:clipToPadding="false" android:clipChildren="false"> - + - - - - - + android:layout_marginRight="@dimen/conversation_individual_right_gutter" + android:layout_marginEnd="@dimen/conversation_individual_right_gutter" + android:layout_marginBottom="@dimen/below_bubble" + android:paddingLeft="6dp" + android:paddingStart="6dp" + android:clipToPadding="false" + android:clipChildren="false" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@id/jumpto_icon"> + + - + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_alignBottom="@id/body_bubble"> - + - + + android:layout_marginRight="@dimen/message_bubble_edge_margin" + android:layout_marginEnd="@dimen/message_bubble_edge_margin" + android:layout_marginLeft="6dp" + android:layout_marginStart="6dp" + android:layout_toRightOf="@id/contact_photo_container" + android:layout_toEndOf="@id/contact_photo_container" + android:orientation="vertical" + android:clipToPadding="false" + android:clipChildren="false" + android:background="@color/white" + tools:backgroundTint="@color/core_light_10"> - + android:layout_marginTop="@dimen/message_bubble_top_padding" + android:layout_marginBottom="2dp" + android:layout_marginLeft="@dimen/message_bubble_horizontal_padding" + android:layout_marginRight="@dimen/message_bubble_horizontal_padding" + android:orientation="horizontal" + android:visibility="gone" + tools:visibility="visible"> - + - + - + - + - + - + - + - + - + - + -