From 56705bde747c4af9bf5402d0edd3ac04db1b35cc Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 16 Dec 2020 11:21:24 -0300
Subject: [PATCH] Show bomb badge in same style as send button

---
 briar-android/src/main/res/drawable/bomb_badge.xml  | 13 -------------
 .../main/res/layout/view_composite_send_button.xml  |  5 ++---
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 briar-android/src/main/res/drawable/bomb_badge.xml

diff --git a/briar-android/src/main/res/drawable/bomb_badge.xml b/briar-android/src/main/res/drawable/bomb_badge.xml
deleted file mode 100644
index c3bf3da45..000000000
--- a/briar-android/src/main/res/drawable/bomb_badge.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="oval">
-
-	<padding
-		android:bottom="1dp"
-		android:left="1dp"
-		android:right="1dp"
-		android:top="1dp" />
-
-	<solid android:color="@color/item_background_highlight" />
-
-</shape>
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 01b474b85..062e36740 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
@@ -42,12 +42,11 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="end|bottom"
-		android:layout_margin="1dp"
-		android:background="@drawable/bomb_badge"
+		android:layout_margin="3dp"
 		android:contentDescription="@string/auto_delete_msg_contact_enabled"
 		android:visibility="invisible"
 		app:srcCompat="@drawable/ic_bomb"
-		app:tint="@color/color_primary"
+		app:tint="@color/briar_accent"
 		tools:visibility="visible" />
 
 	<ProgressBar