From 8ec8cc927b6436526cde449d8c8e6bc48f9b1f9b Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 21 Jan 2021 14:20:11 -0300 Subject: [PATCH 1/4] Use vector support libraries instead of rasterizing all drawables https://developer.android.com/guide/topics/graphics/vector-drawable-resources#vector-drawables-backward-solution --- briar-android/build.gradle | 2 ++ .../src/main/res/layout-h650dp/navigation_header.xml | 3 ++- .../src/main/res/layout-land/fragment_keyagreement_id.xml | 4 ++-- briar-android/src/main/res/layout/activity_nav_drawer.xml | 2 +- .../src/main/res/layout/activity_sharing_status.xml | 2 +- briar-android/src/main/res/layout/activity_unlock.xml | 2 +- briar-android/src/main/res/layout/author_view.xml | 4 ++-- briar-android/src/main/res/layout/emoji_text_input_view.xml | 2 +- briar-android/src/main/res/layout/fragment_crash.xml | 2 +- briar-android/src/main/res/layout/fragment_error.xml | 2 +- .../src/main/res/layout/fragment_error_contact_exchange.xml | 2 +- .../src/main/res/layout/fragment_keyagreement_id.xml | 4 ++-- .../src/main/res/layout/fragment_link_exchange.xml | 4 ++-- briar-android/src/main/res/layout/fragment_nickname.xml | 4 ++-- .../src/main/res/layout/fragment_open_database.xml | 2 +- briar-android/src/main/res/layout/fragment_sign_out.xml | 2 +- briar-android/src/main/res/layout/image_preview.xml | 4 ++-- briar-android/src/main/res/layout/introduction_message.xml | 2 +- briar-android/src/main/res/layout/list_item_blog_post.xml | 2 +- .../src/main/res/layout/list_item_pending_contact.xml | 2 +- .../src/main/res/layout/list_item_revealable_contact.xml | 2 +- briar-android/src/main/res/layout/list_item_rss_feed.xml | 2 +- briar-android/src/main/res/layout/power_view.xml | 6 +++--- briar-android/src/main/res/layout/qr_code_view.xml | 3 ++- briar-android/src/main/res/layout/splash.xml | 3 ++- .../src/main/res/layout/view_composite_send_button.xml | 4 ++-- briar-android/src/main/res/values/styles.xml | 2 +- 27 files changed, 40 insertions(+), 35 deletions(-) diff --git a/briar-android/build.gradle b/briar-android/build.gradle index 95c18ca3c..12f93024c 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -25,6 +25,8 @@ android { versionCode 10213 versionName "1.2.13" applicationId "org.briarproject.briar.android" + + vectorDrawables.useSupportLibrary = true buildConfigField "String", "GitHash", "\"${getStdout(['git', 'rev-parse', '--short=7', 'HEAD'], 'No commit hash')}\"" def now = (long) (System.currentTimeMillis() / 1000) diff --git a/briar-android/src/main/res/layout-h650dp/navigation_header.xml b/briar-android/src/main/res/layout-h650dp/navigation_header.xml index 92a452e94..4661f362c 100644 --- a/briar-android/src/main/res/layout-h650dp/navigation_header.xml +++ b/briar-android/src/main/res/layout-h650dp/navigation_header.xml @@ -1,5 +1,6 @@ + app:srcCompat="@drawable/navigation_drawer_header" /> diff --git a/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml b/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml index 91b1da901..fb2fe2c21 100644 --- a/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml +++ b/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml @@ -20,11 +20,11 @@ android:adjustViewBounds="true" android:padding="@dimen/margin_medium" android:scaleType="fitCenter" - android:src="@drawable/qr_code_intro" app:layout_constraintBottom_toBottomOf="@id/explanationText" app:layout_constraintEnd_toStartOf="@id/explanationText" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/qr_code_intro" app:tint="@color/color_primary" tools:ignore="ContentDescription" /> @@ -38,11 +38,11 @@ android:paddingTop="@dimen/margin_large" android:paddingEnd="@dimen/margin_large" android:scaleType="fitCenter" - android:src="@drawable/qr_code_explanation" app:layout_constraintBottom_toTopOf="@id/explanationText" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/diagram" app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/qr_code_explanation" tools:ignore="ContentDescription" /> \ No newline at end of file diff --git a/briar-android/src/main/res/layout/author_view.xml b/briar-android/src/main/res/layout/author_view.xml index a90aeb046..99d3cc04c 100644 --- a/briar-android/src/main/res/layout/author_view.xml +++ b/briar-android/src/main/res/layout/author_view.xml @@ -29,10 +29,10 @@ android:contentDescription="@string/blogs_reblog_button" android:padding="2dp" android:scaleType="fitCenter" - android:src="@drawable/ic_repeat" android:visibility="invisible" app:layout_constraintBottom_toBottomOf="@+id/avatar" - app:layout_constraintEnd_toEndOf="@+id/avatar" /> + app:layout_constraintEnd_toEndOf="@+id/avatar" + app:srcCompat="@drawable/ic_repeat" /> diff --git a/briar-android/src/main/res/layout/fragment_error.xml b/briar-android/src/main/res/layout/fragment_error.xml index 300ff69a0..bd663a9e3 100644 --- a/briar-android/src/main/res/layout/fragment_error.xml +++ b/briar-android/src/main/res/layout/fragment_error.xml @@ -14,10 +14,10 @@ android:layout_marginTop="8dp" android:layout_marginEnd="8dp" android:layout_marginRight="8dp" - android:src="@drawable/alerts_and_states_error" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/alerts_and_states_error" app:tint="?attr/colorControlNormal" tools:ignore="ContentDescription" /> diff --git a/briar-android/src/main/res/layout/fragment_error_contact_exchange.xml b/briar-android/src/main/res/layout/fragment_error_contact_exchange.xml index 3e18f40b1..d06ef1187 100644 --- a/briar-android/src/main/res/layout/fragment_error_contact_exchange.xml +++ b/briar-android/src/main/res/layout/fragment_error_contact_exchange.xml @@ -30,10 +30,10 @@ android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:scaleType="fitCenter" - android:src="@drawable/qr_code_error" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/errorTitle" + app:srcCompat="@drawable/qr_code_error" app:tint="?attr/colorControlNormal" tools:ignore="ContentDescription" /> diff --git a/briar-android/src/main/res/layout/fragment_keyagreement_id.xml b/briar-android/src/main/res/layout/fragment_keyagreement_id.xml index 955e8e71e..eb29e78fc 100644 --- a/briar-android/src/main/res/layout/fragment_keyagreement_id.xml +++ b/briar-android/src/main/res/layout/fragment_keyagreement_id.xml @@ -19,11 +19,11 @@ android:adjustViewBounds="true" android:paddingBottom="@dimen/margin_large" android:scaleType="fitCenter" - android:src="@drawable/qr_code_intro" app:layout_constraintBottom_toTopOf="@id/explanationImage" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/qr_code_intro" app:tint="@color/color_primary" /> diff --git a/briar-android/src/main/res/layout/fragment_sign_out.xml b/briar-android/src/main/res/layout/fragment_sign_out.xml index 610f7fac1..c701bf28c 100644 --- a/briar-android/src/main/res/layout/fragment_sign_out.xml +++ b/briar-android/src/main/res/layout/fragment_sign_out.xml @@ -10,13 +10,13 @@ android:layout_width="128dp" android:layout_height="128dp" android:scaleType="center" - android:src="@drawable/startup_lock" app:layout_constraintBottom_toTopOf="@+id/textView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" app:layout_constraintVertical_chainStyle="packed" + app:srcCompat="@drawable/startup_lock" app:tint="@color/briar_primary" tools:ignore="ContentDescription" /> diff --git a/briar-android/src/main/res/layout/image_preview.xml b/briar-android/src/main/res/layout/image_preview.xml index 9ec0317e9..83bd2271e 100644 --- a/briar-android/src/main/res/layout/image_preview.xml +++ b/briar-android/src/main/res/layout/image_preview.xml @@ -38,13 +38,13 @@ android:layout_marginEnd="8dp" android:layout_marginRight="8dp" android:layout_marginBottom="8dp" - android:src="@drawable/ic_close" app:backgroundTint="@color/briar_accent" app:fabCustomSize="26dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0" - app:maxImageSize="18dp" /> + app:maxImageSize="18dp" + app:srcCompat="@drawable/ic_close" /> diff --git a/briar-android/src/main/res/layout/introduction_message.xml b/briar-android/src/main/res/layout/introduction_message.xml index 518fa2f91..97387d6f6 100644 --- a/briar-android/src/main/res/layout/introduction_message.xml +++ b/briar-android/src/main/res/layout/introduction_message.xml @@ -43,11 +43,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/margin_large" - android:src="@drawable/ic_contact_introduction" app:layout_constraintBottom_toBottomOf="@+id/barrier" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/avatarContact2" + app:srcCompat="@drawable/ic_contact_introduction" app:tint="?attr/colorControlNormal" tools:ignore="ContentDescription" /> diff --git a/briar-android/src/main/res/layout/list_item_blog_post.xml b/briar-android/src/main/res/layout/list_item_blog_post.xml index 293b69ae3..fa53019cf 100644 --- a/briar-android/src/main/res/layout/list_item_blog_post.xml +++ b/briar-android/src/main/res/layout/list_item_blog_post.xml @@ -47,9 +47,9 @@ android:layout_height="@dimen/button_size" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/blogs_reblog_comment_hint" - android:src="@drawable/ic_repeat" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/ic_repeat" app:tint="?attr/colorControlNormal" /> diff --git a/briar-android/src/main/res/layout/list_item_rss_feed.xml b/briar-android/src/main/res/layout/list_item_rss_feed.xml index 81414aa96..f5f76e024 100644 --- a/briar-android/src/main/res/layout/list_item_rss_feed.xml +++ b/briar-android/src/main/res/layout/list_item_rss_feed.xml @@ -27,9 +27,9 @@ android:layout_margin="@dimen/margin_medium" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/delete" - android:src="@drawable/action_delete_black" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/action_delete_black" app:tint="?attr/colorControlNormal" /> @@ -52,10 +52,10 @@ android:layout_height="24dp" android:layout_margin="@dimen/margin_medium" android:contentDescription="@string/help" - android:src="@drawable/ic_help_outline_white" android:tint="@color/briar_button_text_positive" app:layout_constraintBottom_toBottomOf="@+id/button" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="@+id/button" /> + app:layout_constraintTop_toTopOf="@+id/button" + app:srcCompat="@drawable/ic_help_outline_white" /> \ No newline at end of file diff --git a/briar-android/src/main/res/layout/qr_code_view.xml b/briar-android/src/main/res/layout/qr_code_view.xml index 351ad5765..603549056 100644 --- a/briar-android/src/main/res/layout/qr_code_view.xml +++ b/briar-android/src/main/res/layout/qr_code_view.xml @@ -1,5 +1,6 @@ @@ -25,6 +26,6 @@ android:alpha="0.54" android:background="?attr/selectableItemBackground" android:contentDescription="@string/show_qr_code_fullscreen" - android:src="@drawable/ic_fullscreen_black_48dp" /> + app:srcCompat="@drawable/ic_fullscreen_black_48dp" /> diff --git a/briar-android/src/main/res/layout/splash.xml b/briar-android/src/main/res/layout/splash.xml index 410dbb74d..0cd22a43c 100644 --- a/briar-android/src/main/res/layout/splash.xml +++ b/briar-android/src/main/res/layout/splash.xml @@ -1,5 +1,6 @@ @@ -9,6 +10,6 @@ android:layout_gravity="center" android:layout_margin="@dimen/margin_xxlarge" android:contentDescription="@string/app_name" - android:src="@drawable/splash_screen" /> + app:srcCompat="@drawable/splash_screen" /> diff --git a/briar-android/src/main/res/layout/view_composite_send_button.xml b/briar-android/src/main/res/layout/view_composite_send_button.xml index 8ecfb1b81..b72677e71 100644 --- a/briar-android/src/main/res/layout/view_composite_send_button.xml +++ b/briar-android/src/main/res/layout/view_composite_send_button.xml @@ -19,8 +19,8 @@ android:focusable="true" android:padding="4dp" android:scaleType="center" - android:src="@drawable/ic_image_off" android:visibility="invisible" + app:srcCompat="@drawable/ic_image_off" app:tint="?attr/colorControlNormal" /> @drawable/bubble_completed center - @drawable/ic_check_white + @drawable/ic_check_white \ No newline at end of file From c93e5441b02d88e991747bff43a0b9cdac8db062 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 21 Jan 2021 14:57:04 -0300 Subject: [PATCH 2/4] Store rasterized notification icons, because NotificationCompat doesn't handle it and would crash on API < 21 --- briar-android/artwork/notification_signout.svg | 1 + .../android/AndroidNotificationManagerImpl.java | 4 ++-- .../src/main/res/drawable-anydpi-v24/ic_lock.xml | 15 +++++++++++++++ .../notification_blog.xml | 10 +++++----- .../notification_contact_added.xml | 10 +++++----- .../notification_forum.xml | 0 .../notification_ongoing.xml | 0 .../notification_private_group.xml | 10 +++++----- .../notification_private_message.xml | 10 +++++----- .../drawable-anydpi-v24/notification_signout.xml | 15 +++++++++++++++ .../src/main/res/drawable-hdpi/ic_lock.png | Bin 0 -> 341 bytes .../main/res/drawable-hdpi/notification_blog.png | Bin 0 -> 229 bytes .../drawable-hdpi/notification_contact_added.png | Bin 0 -> 316 bytes .../res/drawable-hdpi/notification_forum.png | Bin 0 -> 245 bytes .../res/drawable-hdpi/notification_ongoing.png | Bin 0 -> 498 bytes .../drawable-hdpi/notification_private_group.png | Bin 0 -> 359 bytes .../notification_private_message.png | Bin 0 -> 235 bytes .../res/drawable-hdpi/notification_signout.png | Bin 0 -> 266 bytes .../src/main/res/drawable-mdpi/ic_lock.png | Bin 0 -> 263 bytes .../main/res/drawable-mdpi/notification_blog.png | Bin 0 -> 200 bytes .../drawable-mdpi/notification_contact_added.png | Bin 0 -> 228 bytes .../res/drawable-mdpi/notification_forum.png | Bin 0 -> 205 bytes .../res/drawable-mdpi/notification_ongoing.png | Bin 0 -> 387 bytes .../drawable-mdpi/notification_private_group.png | Bin 0 -> 279 bytes .../notification_private_message.png | Bin 0 -> 202 bytes .../res/drawable-mdpi/notification_signout.png | Bin 0 -> 205 bytes .../src/main/res/drawable-xhdpi/ic_lock.png | Bin 0 -> 442 bytes .../res/drawable-xhdpi/notification_blog.png | Bin 0 -> 273 bytes .../notification_contact_added.png | Bin 0 -> 362 bytes .../res/drawable-xhdpi/notification_forum.png | Bin 0 -> 291 bytes .../res/drawable-xhdpi/notification_ongoing.png | Bin 0 -> 663 bytes .../notification_private_group.png | Bin 0 -> 489 bytes .../notification_private_message.png | Bin 0 -> 250 bytes .../res/drawable-xhdpi/notification_signout.png | Bin 0 -> 298 bytes .../src/main/res/drawable-xxhdpi/ic_lock.png | Bin 0 -> 618 bytes .../res/drawable-xxhdpi/notification_blog.png | Bin 0 -> 348 bytes .../notification_contact_added.png | Bin 0 -> 521 bytes .../res/drawable-xxhdpi/notification_forum.png | Bin 0 -> 367 bytes .../res/drawable-xxhdpi/notification_ongoing.png | Bin 0 -> 977 bytes .../notification_private_group.png | Bin 0 -> 652 bytes .../notification_private_message.png | Bin 0 -> 334 bytes .../res/drawable-xxhdpi/notification_signout.png | Bin 0 -> 402 bytes 42 files changed, 53 insertions(+), 22 deletions(-) create mode 100644 briar-android/artwork/notification_signout.svg create mode 100644 briar-android/src/main/res/drawable-anydpi-v24/ic_lock.xml rename briar-android/src/main/res/{drawable => drawable-anydpi-v24}/notification_blog.xml (58%) rename briar-android/src/main/res/{drawable => drawable-anydpi-v24}/notification_contact_added.xml (68%) rename briar-android/src/main/res/{drawable => drawable-anydpi-v24}/notification_forum.xml (100%) rename briar-android/src/main/res/{drawable => drawable-anydpi-v24}/notification_ongoing.xml (100%) rename briar-android/src/main/res/{drawable => drawable-anydpi-v24}/notification_private_group.xml (74%) rename briar-android/src/main/res/{drawable => drawable-anydpi-v24}/notification_private_message.xml (60%) create mode 100644 briar-android/src/main/res/drawable-anydpi-v24/notification_signout.xml create mode 100644 briar-android/src/main/res/drawable-hdpi/ic_lock.png create mode 100644 briar-android/src/main/res/drawable-hdpi/notification_blog.png create mode 100644 briar-android/src/main/res/drawable-hdpi/notification_contact_added.png create mode 100644 briar-android/src/main/res/drawable-hdpi/notification_forum.png create mode 100644 briar-android/src/main/res/drawable-hdpi/notification_ongoing.png create mode 100644 briar-android/src/main/res/drawable-hdpi/notification_private_group.png create mode 100644 briar-android/src/main/res/drawable-hdpi/notification_private_message.png create mode 100644 briar-android/src/main/res/drawable-hdpi/notification_signout.png create mode 100644 briar-android/src/main/res/drawable-mdpi/ic_lock.png create mode 100644 briar-android/src/main/res/drawable-mdpi/notification_blog.png create mode 100644 briar-android/src/main/res/drawable-mdpi/notification_contact_added.png create mode 100644 briar-android/src/main/res/drawable-mdpi/notification_forum.png create mode 100644 briar-android/src/main/res/drawable-mdpi/notification_ongoing.png create mode 100644 briar-android/src/main/res/drawable-mdpi/notification_private_group.png create mode 100644 briar-android/src/main/res/drawable-mdpi/notification_private_message.png create mode 100644 briar-android/src/main/res/drawable-mdpi/notification_signout.png create mode 100644 briar-android/src/main/res/drawable-xhdpi/ic_lock.png create mode 100644 briar-android/src/main/res/drawable-xhdpi/notification_blog.png create mode 100644 briar-android/src/main/res/drawable-xhdpi/notification_contact_added.png create mode 100644 briar-android/src/main/res/drawable-xhdpi/notification_forum.png create mode 100644 briar-android/src/main/res/drawable-xhdpi/notification_ongoing.png create mode 100644 briar-android/src/main/res/drawable-xhdpi/notification_private_group.png create mode 100644 briar-android/src/main/res/drawable-xhdpi/notification_private_message.png create mode 100644 briar-android/src/main/res/drawable-xhdpi/notification_signout.png create mode 100644 briar-android/src/main/res/drawable-xxhdpi/ic_lock.png create mode 100644 briar-android/src/main/res/drawable-xxhdpi/notification_blog.png create mode 100644 briar-android/src/main/res/drawable-xxhdpi/notification_contact_added.png create mode 100644 briar-android/src/main/res/drawable-xxhdpi/notification_forum.png create mode 100644 briar-android/src/main/res/drawable-xxhdpi/notification_ongoing.png create mode 100644 briar-android/src/main/res/drawable-xxhdpi/notification_private_group.png create mode 100644 briar-android/src/main/res/drawable-xxhdpi/notification_private_message.png create mode 100644 briar-android/src/main/res/drawable-xxhdpi/notification_signout.png diff --git a/briar-android/artwork/notification_signout.svg b/briar-android/artwork/notification_signout.svg new file mode 100644 index 000000000..ac9680fe8 --- /dev/null +++ b/briar-android/artwork/notification_signout.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java index 7bad14178..90965b6b9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java @@ -255,7 +255,7 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager, R.string.ongoing_notification_title; int text = locked ? R.string.lock_tap_to_unlock : R.string.ongoing_notification_text; - int icon = locked ? R.drawable.startup_lock : + int icon = locked ? R.drawable.ic_lock : R.drawable.notification_ongoing; // Ongoing foreground notification that shows BriarService is running NotificationCompat.Builder b = @@ -624,7 +624,7 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager, NotificationCompat.Builder b = new NotificationCompat.Builder(appContext, REMINDER_CHANNEL_ID); - b.setSmallIcon(R.drawable.ic_signout); + b.setSmallIcon(R.drawable.notification_signout); b.setColor(getColor(appContext, R.color.briar_primary)); b.setContentTitle( appContext.getText(R.string.reminder_notification_title)); diff --git a/briar-android/src/main/res/drawable-anydpi-v24/ic_lock.xml b/briar-android/src/main/res/drawable-anydpi-v24/ic_lock.xml new file mode 100644 index 000000000..cf2c80ccf --- /dev/null +++ b/briar-android/src/main/res/drawable-anydpi-v24/ic_lock.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/briar-android/src/main/res/drawable/notification_blog.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_blog.xml similarity index 58% rename from briar-android/src/main/res/drawable/notification_blog.xml rename to briar-android/src/main/res/drawable-anydpi-v24/notification_blog.xml index d5218f632..3432e1312 100644 --- a/briar-android/src/main/res/drawable/notification_blog.xml +++ b/briar-android/src/main/res/drawable-anydpi-v24/notification_blog.xml @@ -1,10 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M13,12h7v1.5h-7zM13,9.5h7L20,11h-7zM13,14.5h7L20,16h-7zM21,4L3,4c-1.1,0 -2,0.9 -2,2v13c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,6c0,-1.1 -0.9,-2 -2,-2zM21,19h-9L12,6h9v13z" /> diff --git a/briar-android/src/main/res/drawable/notification_contact_added.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_contact_added.xml similarity index 68% rename from briar-android/src/main/res/drawable/notification_contact_added.xml rename to briar-android/src/main/res/drawable-anydpi-v24/notification_contact_added.xml index 48c8339f0..dbeb8ef60 100644 --- a/briar-android/src/main/res/drawable/notification_contact_added.xml +++ b/briar-android/src/main/res/drawable-anydpi-v24/notification_contact_added.xml @@ -1,10 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M20,0L4,0v2h16L20,0zM4,24h16v-2L4,22v2zM20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM12,6.75c1.24,0 2.25,1.01 2.25,2.25s-1.01,2.25 -2.25,2.25S9.75,10.24 9.75,9 10.76,6.75 12,6.75zM17,17L7,17v-1.5c0,-1.67 3.33,-2.5 5,-2.5s5,0.83 5,2.5L17,17z" /> diff --git a/briar-android/src/main/res/drawable/notification_forum.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_forum.xml similarity index 100% rename from briar-android/src/main/res/drawable/notification_forum.xml rename to briar-android/src/main/res/drawable-anydpi-v24/notification_forum.xml diff --git a/briar-android/src/main/res/drawable/notification_ongoing.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_ongoing.xml similarity index 100% rename from briar-android/src/main/res/drawable/notification_ongoing.xml rename to briar-android/src/main/res/drawable-anydpi-v24/notification_ongoing.xml diff --git a/briar-android/src/main/res/drawable/notification_private_group.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_private_group.xml similarity index 74% rename from briar-android/src/main/res/drawable/notification_private_group.xml rename to briar-android/src/main/res/drawable-anydpi-v24/notification_private_group.xml index 55cbde9ee..cbe143955 100644 --- a/briar-android/src/main/res/drawable/notification_private_group.xml +++ b/briar-android/src/main/res/drawable-anydpi-v24/notification_private_group.xml @@ -1,10 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z" /> diff --git a/briar-android/src/main/res/drawable/notification_private_message.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_private_message.xml similarity index 60% rename from briar-android/src/main/res/drawable/notification_private_message.xml rename to briar-android/src/main/res/drawable-anydpi-v24/notification_private_message.xml index b42ea09e2..48240fe75 100644 --- a/briar-android/src/main/res/drawable/notification_private_message.xml +++ b/briar-android/src/main/res/drawable-anydpi-v24/notification_private_message.xml @@ -1,10 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z" /> diff --git a/briar-android/src/main/res/drawable-anydpi-v24/notification_signout.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_signout.xml new file mode 100644 index 000000000..73940840c --- /dev/null +++ b/briar-android/src/main/res/drawable-anydpi-v24/notification_signout.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/briar-android/src/main/res/drawable-hdpi/ic_lock.png b/briar-android/src/main/res/drawable-hdpi/ic_lock.png new file mode 100644 index 0000000000000000000000000000000000000000..cf1d2dbfe81075f0c325bcefc7c7cd55f9317440 GIT binary patch literal 341 zcmV-b0jmCqP)H2V_fUR15DQT17;hl{ z{hxXOl+eQ|anSbv)CZ3#aS%(J6WGs682hu^O@ib8eEK$z~ViRb{Y#+_`qYfJE4th@m_gtsMLESWPP(C$UjjN$; nWJ>UEXj7PFba-YI&=LRuj1Z9a-^}jZ00000NkvXXu0mjf%hQw~ literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-hdpi/notification_blog.png b/briar-android/src/main/res/drawable-hdpi/notification_blog.png new file mode 100644 index 0000000000000000000000000000000000000000..d8af309d694a43772ff245a790d3ddcf8f4fa3db GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB)_A%&hE&{2PLN<-oFLMZ^5Osg zdQk;Co+JDJUzV$3d-T#_O~ZM|)&DQc#~gnu!N}#DX5ab4a#EaR4qwoMBePRf`hR-d z5_OX`d8M#I@}EPDKgZ?Ej-OA4cpI~;I_n&DYkHq z-fOAOryLyw{FUr{PB_Xq{HbNQb!GZTR^<~<-@kkz5g=_hE8tF(lh%wL4F&e>o-#Z4 cgB#cxRA0|JxL>QI80c;WPgg&ebxsLQ0Axj0fdBvi literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-hdpi/notification_contact_added.png b/briar-android/src/main/res/drawable-hdpi/notification_contact_added.png new file mode 100644 index 0000000000000000000000000000000000000000..562bde2a2640cee2549eae5be2e81cc2c649f6cc GIT binary patch literal 316 zcmV-C0mJ@@P)t^-c%U5g8HaumApSm3A*6vt zKMxT99w-M*#-cxaAkz>iB&vZ}1&D2ccsU87LlXy43Wm3XKsjkU5Vu3?rFl1&jwdldUW(-$PHKx1ONc?9sD%c3^CyV O0000mVRo0*D=;SY}}tGZ5PhCI^AQ{!s^wI%w2E!_h(cv~bXDs9~gHcQmu9;-G#iwzVjBP(PI$e-t^W zA4$vtlsKt?Uz6*gel#(M|Fi)_IVc#5*uXgmPs4xppm7kAqZ}x}ld0+;D&?~NLFFJU vjv9Cep*d=BI0(s6gU3O*ikML_3Md5t4fHh3OEJ&s00000NkvXXu0mjfdaYfE literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-hdpi/notification_ongoing.png b/briar-android/src/main/res/drawable-hdpi/notification_ongoing.png new file mode 100644 index 0000000000000000000000000000000000000000..199c064002bda7bf2ae5afd7f7ca09abd1be04e9 GIT binary patch literal 498 zcmVH@)C!CeQBQSA1!mGA9S^V6+L|INo9r+Wo*#bMl zt|AhFJSm@;q0kVvH^T0ju(KiOWK+MQpnfp>9C7ij1z>(n6!cpXhKe4>hi}DIF=i2T zGxjk9J*J!$hEX!2R5%6c&nIKAf^t?nRnI3VG20B)C{3If6m%u_i?Bgz3Aj(Sfd^kK zf;wbVS@uft0>LQxtv&(Fa)vDXgTMkv<|bmz5^c@cw|)lin-&5npYal$`aI# z!IG%p`1hVQegrw71vkPnhWrO3eOsy_GbRcCkngw#sX#yI1h@?R^Ru=|^yE418Wh|` oG03ZQurC{ed>s?)3#&Eo0|a*wHD>~u3;+NC07*qoM6N<$f;%9{pa1{> literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-hdpi/notification_private_group.png b/briar-android/src/main/res/drawable-hdpi/notification_private_group.png new file mode 100644 index 0000000000000000000000000000000000000000..9bffc2f605f57809b2f54aaa0c921fbec3cc7bde GIT binary patch literal 359 zcmV-t0hs=YP)iwKs+Bx%aEW}f!dA<2jb8FQNep4_Qs;t8!CqkKzhTe88YaO zL3We`l3EEYjzM;m0yP{|{2xEaMpBziKy5KK95kPRCH+Wh`w6I>J=j7hpIT`MSGsr& z#3E>E=rx}7CPS@+jV5b1p=c(kN^GIfz5UUnj ziA+tPK!UjnqYfg+K_bv{gIZXG1an13OZ-tV3P!002ovPDHLk FV1jOIjl%!{ literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-hdpi/notification_private_message.png b/briar-android/src/main/res/drawable-hdpi/notification_private_message.png new file mode 100644 index 0000000000000000000000000000000000000000..9f28a4dddf29be20d45d9c870aff52af094f86ee GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBHhH=@hE&{2PLN<-+`#tW|Ns97 z9rj3ee80@$&z>ZlB%AzUex1S$33lJ*i<`}aA20Y@QgY#6;^PJ1Lp)BrU-@#u-;fhK zf46UKe#cyB+xo-KRQ8K(mV)Y!-x*SimN&0sF0^U=@oR&gg!^Ry#op(QHyWL4>LQje z6nwnkZSz^jm(3>~k2lU}j$!v*=A`F*Y(XCj_s*xT{~f-c{KhYJe1WA#{e~}5-+@dA j*%V`|83tT!MhpyxCZ)|Xv7IOfbUlNotDnm{r-UW|lqF-v literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-hdpi/notification_signout.png b/briar-android/src/main/res/drawable-hdpi/notification_signout.png new file mode 100644 index 0000000000000000000000000000000000000000..7fa1f7ed8de0209d1ac557bc23096732502f72b7 GIT binary patch literal 266 zcmV+l0rmcgP)+?So9hoCGPkEcMz?zJXIV7)Ef@O5`)P>^+0@`VnHa3o3Pk@~N4Q&Qs`^_dqN|O$UMMtNCPfqd~ZuD%pJ$i~=$M09=t<807*qoM6N<$f~j+BDF6Tf literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-mdpi/ic_lock.png b/briar-android/src/main/res/drawable-mdpi/ic_lock.png new file mode 100644 index 0000000000000000000000000000000000000000..780388e399398beea23eb68796b550d1de5fc992 GIT binary patch literal 263 zcmV+i0r>ujP)*|Nk5yObdg(f%r5K|At}^+nZX3r~gNQ%Rsyvh`&Sm>699-05$9}5IZ1=YXI?k zsGI^N7Gy(R8jnS;8!DGgi3QW4hG<}sGl0rXr^JH!P(u`O1Rn^@C&yrCsOxV-4OtDf z3>mM6%H4*lbtcwu320Iz6@c_e5Mx37fAT^6$hKfVH03Bj*;Kc{8?9`jx&`G(YRYM0 z!FOnSpN>@6jnGu&PJspP#8|)r#D~c+9HfVZlmbr&RLKyDbr^;%001#*$D+u;Darr< N002ovPDHLkV1mf!+YneoeI$l9M-&aVfkFQBB=FXCZj+B!$xL49YSv{&_yjoOrnt1Uq?m2Onk%ST?7h`8LnL8i#eP3iC2p$dzTLc^9XdCx@Ct=Vqlo1aB_x0oJbYWX$+pOelF{r5}E+k7fWma literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-mdpi/notification_contact_added.png b/briar-android/src/main/res/drawable-mdpi/notification_contact_added.png new file mode 100644 index 0000000000000000000000000000000000000000..194314c653d6bd66b9bd825c513a12c4535937eb GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjt36#DLn>}1CoC}k@&AAQpZZUZ zHilw5m_ODTZL~hzz_frnVu4+Ux^VNCO%FCd_)vf9U}8+$>p#ooE*wm2WM=feKC$VM z72{UEClLwFORlwviFGKf6kXWLdiFxdF{aeuyG#NVJV*a$rXI}KShk9FfyiW@BSs!s zsSA>>Yi@mDux}1$Z~x&b5fgk|K2GxKWZm4UQJ*H9&6wNGHA}p#M04HC(3cmsomx`4 c)IXPjVPUA9P>p@IIMCS)p00i_>zopr0JL9R#sB~S literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-mdpi/notification_forum.png b/briar-android/src/main/res/drawable-mdpi/notification_forum.png new file mode 100644 index 0000000000000000000000000000000000000000..ef1e2504dda5e8701259e46c1f2a60b5725371dd GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjQ#@T9Ln>}1CrE@n`2YXElEWJZ zCNssWA720WWIuT%>cNNkHU{+-5e!%3`H#HYvT1?bssFr3thQ`nV3BdtUC_n)zVU}0 zV~u2o>4}XDQx>aw=%jUQW5}@((4G*XcUJuv(~i>@V_dWjWHoXXZD6?hGGr@*`;KMK zwN4!R>Zh56ly}ZwCbl5*k;CbzjX;)z?n6mCUQULbYx0~NY2mwo?ql$D^>bP0l+XkK D^0!SO literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-mdpi/notification_ongoing.png b/briar-android/src/main/res/drawable-mdpi/notification_ongoing.png new file mode 100644 index 0000000000000000000000000000000000000000..b68561b2b588127c93df6b5be28611836bdbd70a GIT binary patch literal 387 zcmV-}0et?6P)Nkl+rmn;*8H(}Fl z|Nm1m^JY4`d3n1@nvJ4Qnzc3|6oiV<*q1fD=Jt}`1da)Y(Au!I>>KwDo)Rv0xH(SR zC-@ae?mHvwJpoI?oNyEVX;)h0$#dSDh`kzkh36)*Pr!Iixgbm#Cs;oMZ|UI~U$?Yy z%@q?hY=yu#-{b~`Pa@@-S&v3ALSV|@bBI$Qp~B+*L7;><6%rbe!`kJU35IdtHHU)` zI57vUK>^KX;By>MBThw4CrI1b&{P3UZiZ?b{evMuk@7GX&lQM@4AZ@qVogyH&4Y7Z}&2GOja^fBLxx hXOt&%lt=$R?G6$z1zL-CQ5paM002ovPDHLkV1m18q5l8? literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-mdpi/notification_private_group.png b/briar-android/src/main/res/drawable-mdpi/notification_private_group.png new file mode 100644 index 0000000000000000000000000000000000000000..4f52bc248b9b538fb27ef575366efa1946206c8d GIT binary patch literal 279 zcmV+y0qFjTP)SuIo=vLZGDrr%z;h(| z-TyIx11T27V=>?}5VJrrHsDW+1u9s4Fd0dHKbqWYZ1F_M5_hDa*pD2U&>)-+_0@Ca z_#r2=!Pr&Cmrm^lV?Ccfvy$^0C7EuI36kPu*nOI dRu>}#003`^v=to^^QHg*002ovPDHLkV1i0PY^4AI literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-mdpi/notification_private_message.png b/briar-android/src/main/res/drawable-mdpi/notification_private_message.png new file mode 100644 index 0000000000000000000000000000000000000000..f095ee707ddc50f47fd3855ab18b2df5b807dbe7 GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj6FprVLn>}1CrFe%`2YXEmcttd zwJ^n$A8-CoX}-CGC;W%M?SiJWOzc`w4;*?}e>d)!=dowL4EHNf4~ef&A`0X>o(p%L zpPYQKMrhLWKaP?v?;C&EP5kk9!52q+lh1<9zfW##cqZ8^l;G&iz3y?BMhW+{$pIk; z3d{t$1(F@@b+x3}XG!*@09mWO}1CrC_t@c;jRDTg-= z?6(;Vxp%g$|L-qT!FPmhiBulL)f%~u=Z_DrUieCFa#kaANU|+sDOW)0=gibb1`l3= z-Wm^g!*{L~sl9S*G@Do@7EA@*?Kf~W9v5HTCKk9#AnaFufe2W;Q8eGmSqCX$T}Ql z?J;kX>!v!(?)9l1y7xTpg~_i|6IR|3z4y(+NA9cV8(y(<)imhuKdj8l#G%mOFsmWv z+@$cNce7a9dZNQwxVYx*aq+Thn<2K!W5MYk6K2kAY|_5qmDjn`fSKdUC8wO_fI UhsTaep!*m+UHx3vIVCg!0NQbB;Q#;t literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_contact_added.png b/briar-android/src/main/res/drawable-xhdpi/notification_contact_added.png new file mode 100644 index 0000000000000000000000000000000000000000..2f5d2afa3c9a098754dca241d7ff1c325309c768 GIT binary patch literal 362 zcmV-w0hRuVP)(tHF9_$1H(tznvg!?C~q?|}=@;~&{1J%0Co z?c__~CGF=khf;O&G4PP?M9h8M#v2$jI-+UI^R~5&|P0#*aWc zQ!~Y}cI961H-QN_0iiPhI4mjOJLC0JQ!>U2#o@Q1y%@5 z8hbz!@5H{fRcJT1$hQ`~Xzp@2dM`R?U-I!iF$-+{We=D02I|6a7H)Y{s{jB107*qo IM6N<$g4pkp=Kufz literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_forum.png b/briar-android/src/main/res/drawable-xhdpi/notification_forum.png new file mode 100644 index 0000000000000000000000000000000000000000..990c390c77ee25e3a53da4e355d0646ec7c3e1e4 GIT binary patch literal 291 zcmV+;0o?wHP)kPZo=2pXBB~H#3fKuXS6B^(m0}28NARrNd9D+Xew}7~As*fP7-TnKj_cPmc{O!0-`TK?5cb7=RH34qyO*1?WNG p0XzgIpo72#ybvq?dS#dd^8{;mry^fDq;3EJ002ovPDHLkV1n@YY9ast literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_ongoing.png b/briar-android/src/main/res/drawable-xhdpi/notification_ongoing.png new file mode 100644 index 0000000000000000000000000000000000000000..8cdafa9d302f6f944b018d4e8ac4c3412ad6f06e GIT binary patch literal 663 zcmV;I0%-k-P)bn4}hpZR95f+Cr(r#Pn6iX>mHo{*zRUoa%0EQMjk#$rRmIvlZ zyvP-2#DMf}Y-*_3eQMxd03#3eBt#6DDzeiDDWCd^8^pF)$RgLnRS4_w$ZwFL;kD62yS`ZtMXm zq?u}xoX8dv@l|DM)_Mb4??R42?6Me_z_$+K z4C%fS0x>(6Bz`H<*=3YMmdj+$q9}zP3g6h!FGmzAv2v)Yp(pyWqfiNJGFPJk_GHdL zro1N5QY&Eh>C~`L_|ep9{_>KOdfzoh{yvVDD7c ziU`DYZ)TZcZkA+|=B|kSW`4!}$^LhjyB$U&K@bE%5CpdqIkR#-WAiE*bI;} zi})tIRp0PK1~@1_6Jz^udAAv$U>5O1d^wHd%~I0i2X32(^o z9XWT&UqeJKA7s{Z1*@hzWatn99*gH7HExlR;SF(YeNp%ub$7T7{LJWx&Csc zJN1kZCOdrhxNq@u(5D&(y*jB`4D({tHO#y2&r;bzZ?Q+?eG8_yWF6NqXsPV7Bvye- z%$fa@&rrePB>{KST6og@l6dr*QC>S6Gdr*25M#u;mD`kod@-PwwLP->(IJ_hONw4NUBpU-&MF=@= z%q*no(!`x+x^~!FzD;wp{WEoFx7>LT<(G(%12~(%bUA?N5D)%i#2Ns=QGyp50EY$i>VQTWaLwJ1y#OBbd&23PfQ!Os^(b5Z z4M3y(3xH1fCjhPTD}Y}41wga>45<0VNeKB#MmsaAtN|i|&;S4c07*qoM6N<$f~nzQ Ay8r+H literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_signout.png b/briar-android/src/main/res/drawable-xhdpi/notification_signout.png new file mode 100644 index 0000000000000000000000000000000000000000..68f0c37d9e7d4f64fd7050d380561cc381b0f81e GIT binary patch literal 298 zcmV+_0oDGAP)y2j2(aQ$sLD@_eT>3iWNS|)pp!Z1bQ->(!7eG`ihA~i w2msjJg>SE84>)EB+!50U1n!WJqNv~28%5L`6oj;ps{jB107*qoM6N<$f=ixq>;M1& literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-xxhdpi/ic_lock.png b/briar-android/src/main/res/drawable-xxhdpi/ic_lock.png new file mode 100644 index 0000000000000000000000000000000000000000..848892ae9b399636170a07d457b13a0aab49aeed GIT binary patch literal 618 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2U^4V{aSW-r^>&V8@gW0|^JCKF~dPg?Kh(UhYKsyL3RfPK@OHhOr0}kIQaM|YA!Tn(%yAfmW7pC*uHGu5x**T{i*^r$^KbO7H0;TS{$BovVP*_j0jN+-Iw26 zT&`czFZp%#gl$#++zWn3b3z#}oSN{Uearksd;RZU%{(gGm+zr7Eib*}@-j24pK};x zc_zPk&=;weVjW}krS6t$Rq3uwpLw|!$}jx`<5q6$ z&5^TAZ7b$JxtTFT^G8M|^M#p$3pV#2UvcM(R@J|UYWy($91S^4R+3q*bJ&)2i8kF{ zWwgqS+epMHL~KG-@q4u|mwh9qmoo+2dc>;EcvSLNcPxuY>I?lM!GIYH_g`>zn9cJy zH-@D|P?PJ}%SrWxU$w+UP5y8Aw@~60*Mb!c+GjS(U)wJA%IKflX%FS9x!6`cw3qG<;}BPJ0I$} zNd8;m@aK(T=+3`!Da)IHbK!7 zd;$j=8Fi%i$>EyRIr?yUUdcM-w!-D7XoUWxsQJnLyh50Feyl{gpzHHWlR=e_vY`Sa0?t_OmY>2)^o!?CKfK}s%UoIhxgeQe zVkL7_c6xbAq7;U_#&QV>7#GcKR4=$MT#f01~!9qUOWmSp+?oQX&#mTKK1jA zo%xwnPZZ3iybOAyJn8c7J*yu-Yb<9eI%fH78|&I>8_MtW7q5<$Y25Xyo1N5QY)R2p%8;i9kdmGlQsz=mQ}70EkE=50D3lsEF)CR8&?}L?DnzLs`rW-P_}X3U zfWFBqlM>@f$+6;lMFZ%>-vDbnnd)b!x3-XBKOE3TCw>n51*SYkuz+$8ohIo&CiRB` z`taC}vkno^vqwNrAp*)h0?GjhfaC!xIdC5?QLLg^4Hpm^sL+CkCeCZhY%QY=<{vbY z<0yi1brj*o<4_!CfglL#n-q?P{|N|xEC4_N1V8}PV?Zc1AgGhhquXS*Sak0600000 LNkvXXu0mjfsT|*i literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-xxhdpi/notification_forum.png b/briar-android/src/main/res/drawable-xxhdpi/notification_forum.png new file mode 100644 index 0000000000000000000000000000000000000000..68473d89765772110a20edeffa7bca2fd233f558 GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2U^Me|aSW-r_4bycP?Lj5dm+=r zgbxyI{0ZtpHVqS*3mEznOe8wk_#O)Kur0p$Lh#!09>H&Gjd_00_`7dry`tfM$AT$3 z%1TN~i!RP7&W=>h?p-@gbYo%B&C@sED&IcFa?AR6sbQlYH^Z)@ELn_9910B#Afkuy z{gho($!=Kz~OkZB;f0w-ev(9cS+m-n_d2hDL z8aq5I&|#c;WFu3G*m0%_nR9M9G+PwCG58$pbK9Ej!i%Y&e_t>1^yPc}6Pg=`AoI89ZJ6T-G@yGywqMrij1* literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-xxhdpi/notification_ongoing.png b/briar-android/src/main/res/drawable-xxhdpi/notification_ongoing.png new file mode 100644 index 0000000000000000000000000000000000000000..af601574273fb069c31b95c81fc5a14856d220e0 GIT binary patch literal 977 zcmV;?11|iDP)RI`C3E0$&nnryN~qJC;7AVekEUBdGXR3A%yf8E}euSMMx1*Y$+0o z14T~$NzVV4@ZUuIe}-)&q(c!Sba{3fMiT%Rn*l(Jg5yd-k zN7!6PO_B3}FvOn}8;S)7GoZf|9`uD`#dR$yb_j3D=KRpa%7K!To^rc9aExk@6IRUW zE5!$bq>)LRgV|PhlIZ#sp=&3Z+XT7Y`X;;;#vp$HbgmHk9woZI)G*v#odjWB`5vHi ziqLlt(1#8IbOwQ>g#;1hV3MZ~S&IqEl+qIJmPv~VVzO4r%IhYcheGUAg`Fh?9cxtq zEX%P>5`;I{yx5gXR>+v*x`EmfhM+}72r!WZlR2vB#;bH9!*-iA&CEGCwcK5$fN?vew{i@&{FbjfezR1GC>Pvmk(&o%p4|2mj9&??FPY{+Mzr`e5%o}N#kxo28 zVmH6Fl%OVMt1H!DtL-~~&>|8fK~uw6A=})Mj%0NvDfWX2YAEStRni|il2u5#;~CHm zv5KGqNswd6L)C)W+(m+b)zZ{>$<=a#w3J+f3nnOl?p0CSXX!9O8|AhSpmF%dx|I$Z zX;y>!RBjvsThA=kxpm0R-$|SguJw#Kyuen|zJzyVptv^-$N|r|?vku~{6%-F@yuVC z2+baU0lNG)B&%zcz3Y$Q0S5MmI5in;*9eMrx=HLo@;41pZBZr?UDq}Gc3s`E1okSz ztwdj<>ur<2#{r?D|0+UZBACl8NmayM)2@vxblo6o>E7 z7JHvIf7g{nT}b@;$Ht$fgL|378><>_JpS`C%^W5I(& z8Qw_X9ckMrKIeFdnS*;?#0K;bAvHZ)f;Xx&2XD>JQ=wa!Lxog#Yz^jVE7y*YT;8Om z+Hg`@gvGB_Xv3dH0&kSz9UkkUS;OaOW1nyz_El4ZANwB z@;?_J(k&c2dS`E_cH)jNTol%QyK9fbA+0>U_THOCwGcD2UlM+xYQX;QyGah#l8|U1 zJh+l#8`XZs{axqu+GiR_!1)>ukB#d!e_VC!n>_$4fzP z`Z~{~td-N0`#lfft@}>QTIr?SZ!ds%;1f{v4+Dx25CTF#2nYfFk$@T;lE$iTX*Z-^ m{6hi&000000000007_r~Kjf@9?e!P{0000$X*JXkcJ0I>UU6>BYx7zMoHQ-Z+|Ng2lQj`Iu7p zH+eEMv2aYNHtiH69ac^DWo+W#3|6zZzt$Fpa zJ0*$x4$TRQ|96e)Z;0wPp%p%JraC-*w1z=TI-QZjk7b3jG5;6eR5>6Mf?oJIPEuL9 aXP)i0XKj80iX6ajV(@hJb6Mw<&;$T5UxK#) literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-xxhdpi/notification_signout.png b/briar-android/src/main/res/drawable-xxhdpi/notification_signout.png new file mode 100644 index 0000000000000000000000000000000000000000..1b62d66bc252688d25328961bdbfe7f52149cf3d GIT binary patch literal 402 zcmV;D0d4+?P)~uPW5JCtc$i38HYf?xb02(LW zmQ9Nk5GXBDP@r^3fq~K>1qW&$2_U{=Jfs2QXa2kYD6-UGvC4J_8)j^|vS|;{BM`?v zPv*nHVaPTA`lnq8X$2cvj&Ju wy$zxICDdPnYvK1XX5Ik{K0*i~gpf430dj6CD`9d8h5!Hn literal 0 HcmV?d00001 From 94dd75f24b27f481eff04702930f7051218af8eb Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 21 Jan 2021 15:44:56 -0300 Subject: [PATCH 3/4] Use VectorDrawableCompat compatible ways of setting drawables programmatically so they won't crash on API < 21 --- .../conversation/ConversationActivity.java | 17 ++++++++++------- .../briar/android/login/LoginUtils.java | 10 ++-------- .../android/navdrawer/NavDrawerActivity.java | 9 ++++++--- .../android/navdrawer/TransportsActivity.java | 3 +-- .../briar/android/util/UiUtils.java | 5 +++-- .../briar/android/view/BriarRecyclerView.java | 11 ++--------- .../android/view/TextAttachmentController.java | 6 +++++- .../briar/android/view/TrustIndicatorView.java | 3 +-- .../main/res/layout/fragment_link_exchange.xml | 12 ++++++------ 9 files changed, 36 insertions(+), 40 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java index 9a46153f1..01e0c1647 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java @@ -3,6 +3,7 @@ package org.briarproject.briar.android.conversation; import android.annotation.SuppressLint; import android.content.DialogInterface; import android.content.Intent; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Parcelable; import android.transition.Slide; @@ -105,6 +106,7 @@ import androidx.recyclerview.selection.SelectionTracker.SelectionObserver; import androidx.recyclerview.selection.StorageStrategy; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat; import de.hdodenhof.circleimageview.CircleImageView; import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt; @@ -479,12 +481,10 @@ public class ConversationActivity extends BriarActivity @UiThread private void displayContactOnlineStatus() { if (connectionRegistry.isConnected(contactId)) { - toolbarStatus.setImageDrawable(ContextCompat.getDrawable( - ConversationActivity.this, R.drawable.contact_online)); + toolbarStatus.setImageResource(R.drawable.contact_online); toolbarStatus.setContentDescription(getString(R.string.online)); } else { - toolbarStatus.setImageDrawable(ContextCompat.getDrawable( - ConversationActivity.this, R.drawable.contact_offline)); + toolbarStatus.setImageResource(R.drawable.contact_offline); toolbarStatus.setContentDescription(getString(R.string.offline)); } } @@ -935,13 +935,16 @@ public class ConversationActivity extends BriarActivity return; } + int color = + ContextCompat.getColor(this, R.color.briar_primary); + Drawable drawable = VectorDrawableCompat + .create(getResources(), R.drawable.ic_more_vert_accent, null); new MaterialTapTargetPrompt.Builder(ConversationActivity.this, R.style.OnboardingDialogTheme).setTarget(target) .setPrimaryText(R.string.introduction_onboarding_title) .setSecondaryText(R.string.introduction_onboarding_text) - .setIcon(R.drawable.ic_more_vert_accent) - .setBackgroundColour( - ContextCompat.getColor(this, R.color.briar_primary)) + .setIconDrawable(drawable) + .setBackgroundColour(color) .show(); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java index 39dedadaf..eb0869d91 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java @@ -1,17 +1,13 @@ package org.briarproject.briar.android.login; import android.content.Context; -import android.graphics.drawable.Drawable; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import androidx.appcompat.app.AlertDialog; -import static androidx.core.content.ContextCompat.getColor; -import static androidx.core.content.ContextCompat.getDrawable; -import static androidx.core.graphics.drawable.DrawableCompat.setTint; -import static java.util.Objects.requireNonNull; +import static org.briarproject.briar.android.util.UiUtils.getDialogIcon; @NotNullByDefault class LoginUtils { @@ -19,9 +15,7 @@ class LoginUtils { static AlertDialog createKeyStrengthenerErrorDialog(Context ctx) { AlertDialog.Builder builder = new AlertDialog.Builder(ctx, R.style.BriarDialogTheme); - Drawable icon = getDrawable(ctx, R.drawable.alerts_and_states_error); - setTint(requireNonNull(icon), getColor(ctx, R.color.color_primary)); - builder.setIcon(icon); + builder.setIcon(getDialogIcon(ctx, R.drawable.alerts_and_states_error)); builder.setTitle(R.string.dialog_title_cannot_check_password); builder.setMessage(R.string.dialog_message_cannot_check_password); builder.setPositiveButton(R.string.ok, null); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java index 4b0f456fe..f301f854b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java @@ -2,6 +2,7 @@ package org.briarproject.briar.android.navdrawer; import android.content.Intent; import android.content.res.Configuration; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; import android.view.LayoutInflater; @@ -59,6 +60,7 @@ import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProviders; +import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat; import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt; import static android.view.View.GONE; @@ -433,8 +435,7 @@ public class NavDrawerActivity extends BriarActivity implements Transport t = getItem(position); ImageView icon = view.findViewById(R.id.imageView); - icon.setImageDrawable(ContextCompat.getDrawable( - NavDrawerActivity.this, t.iconDrawable)); + icon.setImageResource(t.iconDrawable); icon.setColorFilter(ContextCompat.getColor( NavDrawerActivity.this, t.iconColor)); @@ -476,11 +477,13 @@ public class NavDrawerActivity extends BriarActivity implements private void showTransportsOnboarding(boolean show, ImageView imageView) { if (show) { int color = resolveColorAttribute(this, R.attr.colorControlNormal); + Drawable drawable = VectorDrawableCompat + .create(getResources(), R.drawable.transport_tor, null); new MaterialTapTargetPrompt.Builder(NavDrawerActivity.this, R.style.OnboardingDialogTheme).setTarget(imageView) .setPrimaryText(R.string.network_settings_title) .setSecondaryText(R.string.transports_onboarding_text) - .setIcon(R.drawable.transport_tor) + .setIconDrawable(drawable) .setIconDrawableColourFilter(color) .setBackgroundColour( ContextCompat.getColor(this, R.color.briar_primary)) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java index 688700cb9..d86c9fea5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java @@ -141,8 +141,7 @@ public class TransportsActivity extends BriarActivity { Transport t = getItem(position); ImageView icon = view.findViewById(R.id.icon); - icon.setImageDrawable(ContextCompat.getDrawable( - TransportsActivity.this, t.iconDrawable)); + icon.setImageResource(t.iconDrawable); icon.setColorFilter(ContextCompat.getColor( TransportsActivity.this, t.iconColor)); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java index 404b7e621..0039dbd28 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java @@ -54,6 +54,7 @@ import androidx.fragment.app.FragmentManager; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LiveData; import androidx.lifecycle.Observer; +import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat; import static android.content.Context.KEYGUARD_SERVICE; import static android.content.Context.POWER_SERVICE; @@ -88,7 +89,6 @@ import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO; import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES; import static androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode; import static androidx.core.content.ContextCompat.getColor; -import static androidx.core.content.ContextCompat.getDrawable; import static androidx.core.content.ContextCompat.getSystemService; import static androidx.core.graphics.drawable.DrawableCompat.setTint; import static androidx.core.view.ViewCompat.LAYOUT_DIRECTION_RTL; @@ -436,7 +436,8 @@ public class UiUtils { } public static Drawable getDialogIcon(Context ctx, @DrawableRes int resId) { - Drawable icon = getDrawable(ctx, resId); + Drawable icon = + VectorDrawableCompat.create(ctx.getResources(), resId, null); setTint(requireNonNull(icon), getColor(ctx, R.color.color_primary)); return icon; } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java index 4dc6c6b3a..c54b3ea17 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java @@ -2,7 +2,6 @@ package org.briarproject.briar.android.view; import android.content.Context; import android.content.res.TypedArray; -import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.Looper; import android.util.AttributeSet; @@ -53,9 +52,8 @@ public class BriarRecyclerView extends FrameLayout { R.styleable.BriarRecyclerView); isScrollingToEnd = attributes .getBoolean(R.styleable.BriarRecyclerView_scrollToEnd, true); - Drawable drawable = attributes - .getDrawable(R.styleable.BriarRecyclerView_emptyImage); - if (drawable != null) setEmptyImage(drawable); + int drawableRes = attributes.getResourceId(R.styleable.BriarRecyclerView_emptyImage, -1); + if (drawableRes != -1) setEmptyImage(drawableRes); String emtpyText = attributes.getString(R.styleable.BriarRecyclerView_emptyText); if (emtpyText != null) setEmptyText(emtpyText); @@ -139,11 +137,6 @@ public class BriarRecyclerView extends FrameLayout { } } - public void setEmptyImage(Drawable drawable) { - if (recyclerView == null) initViews(); - emptyImage.setImageDrawable(drawable); - } - public void setEmptyImage(@DrawableRes int res) { if (recyclerView == null) initViews(); emptyImage.setImageResource(res); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java index 07d7f08a6..a048d43e2 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java @@ -4,6 +4,7 @@ import android.app.Activity; import android.content.ClipData; import android.content.Context; import android.content.Intent; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; @@ -28,6 +29,7 @@ import androidx.customview.view.AbsSavedState; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LiveData; import androidx.lifecycle.Observer; +import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat; import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt; import static android.os.Build.VERSION.SDK_INT; @@ -253,12 +255,14 @@ public class TextAttachmentController extends TextSendController public void showImageOnboarding(Activity activity) { int color = resolveColorAttribute(activity, R.attr.colorControlNormal); + Drawable drawable = VectorDrawableCompat + .create(activity.getResources(), R.drawable.ic_image, null); new MaterialTapTargetPrompt.Builder(activity, R.style.OnboardingDialogTheme).setTarget(sendButton) .setPrimaryText(R.string.dialog_title_image_support) .setSecondaryText(R.string.dialog_message_image_support) .setBackgroundColour(getColor(activity, R.color.briar_primary)) - .setIcon(R.drawable.ic_image) + .setIconDrawable(drawable) .setIconDrawableColourFilter(color) .show(); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TrustIndicatorView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TrustIndicatorView.java index ec1fc98ac..464fd0aa7 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TrustIndicatorView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TrustIndicatorView.java @@ -8,7 +8,6 @@ import org.briarproject.briar.R; import androidx.annotation.UiThread; import androidx.appcompat.widget.AppCompatImageView; -import androidx.core.content.ContextCompat; @UiThread public class TrustIndicatorView extends AppCompatImageView { @@ -44,7 +43,7 @@ public class TrustIndicatorView extends AppCompatImageView { default: res = R.drawable.trust_indicator_unknown; } - setImageDrawable(ContextCompat.getDrawable(getContext(), res)); + setImageResource(res); setVisibility(VISIBLE); invalidate(); diff --git a/briar-android/src/main/res/layout/fragment_link_exchange.xml b/briar-android/src/main/res/layout/fragment_link_exchange.xml index 05df19b47..9f6a71394 100644 --- a/briar-android/src/main/res/layout/fragment_link_exchange.xml +++ b/briar-android/src/main/res/layout/fragment_link_exchange.xml @@ -123,11 +123,11 @@ style="@style/BriarButtonFlat.Positive.Tiny" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:drawableStart="@drawable/ic_content_copy" - android:drawableLeft="@drawable/ic_content_copy" android:drawablePadding="8dp" android:enabled="false" android:text="@string/copy_button" + app:drawableLeftCompat="@drawable/ic_content_copy" + app:drawableStartCompat="@drawable/ic_content_copy" app:layout_constraintEnd_toStartOf="@id/shareButton" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintHorizontal_chainStyle="packed" @@ -139,11 +139,11 @@ style="@style/BriarButtonFlat.Positive.Tiny" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:drawableStart="@drawable/social_share_blue" - android:drawableLeft="@drawable/social_share_blue" android:drawablePadding="8dp" android:enabled="false" android:text="@string/share_button" + app:drawableLeftCompat="@drawable/social_share_blue" + app:drawableStartCompat="@drawable/social_share_blue" app:layout_constraintBottom_toBottomOf="@id/copyButton" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="1.0" @@ -202,10 +202,10 @@ style="@style/BriarButtonFlat.Positive.Tiny" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:drawableStart="@drawable/ic_content_paste" - android:drawableLeft="@drawable/ic_content_paste" android:drawablePadding="8dp" android:text="@string/paste_button" + app:drawableLeftCompat="@drawable/ic_content_paste" + app:drawableStartCompat="@drawable/ic_content_paste" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toStartOf="parent" From 6005d156eb2b1635d6b835072a3b912f5b29fa91 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 26 Jan 2021 08:24:16 -0300 Subject: [PATCH 4/4] Rename ic_lock icon to notification_lock --- .../android/AndroidNotificationManagerImpl.java | 2 +- .../{ic_lock.xml => notification_lock.xml} | 0 .../{ic_lock.png => notification_lock.png} | Bin .../{ic_lock.png => notification_lock.png} | Bin .../{ic_lock.png => notification_lock.png} | Bin .../{ic_lock.png => notification_lock.png} | Bin 6 files changed, 1 insertion(+), 1 deletion(-) rename briar-android/src/main/res/drawable-anydpi-v24/{ic_lock.xml => notification_lock.xml} (100%) rename briar-android/src/main/res/drawable-hdpi/{ic_lock.png => notification_lock.png} (100%) rename briar-android/src/main/res/drawable-mdpi/{ic_lock.png => notification_lock.png} (100%) rename briar-android/src/main/res/drawable-xhdpi/{ic_lock.png => notification_lock.png} (100%) rename briar-android/src/main/res/drawable-xxhdpi/{ic_lock.png => notification_lock.png} (100%) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java index 90965b6b9..4b007e3a0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java @@ -255,7 +255,7 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager, R.string.ongoing_notification_title; int text = locked ? R.string.lock_tap_to_unlock : R.string.ongoing_notification_text; - int icon = locked ? R.drawable.ic_lock : + int icon = locked ? R.drawable.notification_lock : R.drawable.notification_ongoing; // Ongoing foreground notification that shows BriarService is running NotificationCompat.Builder b = diff --git a/briar-android/src/main/res/drawable-anydpi-v24/ic_lock.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_lock.xml similarity index 100% rename from briar-android/src/main/res/drawable-anydpi-v24/ic_lock.xml rename to briar-android/src/main/res/drawable-anydpi-v24/notification_lock.xml diff --git a/briar-android/src/main/res/drawable-hdpi/ic_lock.png b/briar-android/src/main/res/drawable-hdpi/notification_lock.png similarity index 100% rename from briar-android/src/main/res/drawable-hdpi/ic_lock.png rename to briar-android/src/main/res/drawable-hdpi/notification_lock.png diff --git a/briar-android/src/main/res/drawable-mdpi/ic_lock.png b/briar-android/src/main/res/drawable-mdpi/notification_lock.png similarity index 100% rename from briar-android/src/main/res/drawable-mdpi/ic_lock.png rename to briar-android/src/main/res/drawable-mdpi/notification_lock.png diff --git a/briar-android/src/main/res/drawable-xhdpi/ic_lock.png b/briar-android/src/main/res/drawable-xhdpi/notification_lock.png similarity index 100% rename from briar-android/src/main/res/drawable-xhdpi/ic_lock.png rename to briar-android/src/main/res/drawable-xhdpi/notification_lock.png diff --git a/briar-android/src/main/res/drawable-xxhdpi/ic_lock.png b/briar-android/src/main/res/drawable-xxhdpi/notification_lock.png similarity index 100% rename from briar-android/src/main/res/drawable-xxhdpi/ic_lock.png rename to briar-android/src/main/res/drawable-xxhdpi/notification_lock.png