From 5bba0daa89c76734fc7a433d8e7539d7031d9637 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 10 Jun 2024 10:12:56 -0300
Subject: [PATCH] Use new colors for step bubbles when adding contacts remotely

---
 .../src/main/res/drawable/bubble_completed.xml  |  2 +-
 .../src/main/res/drawable/bubble_current.xml    | 13 +++++++++++++
 .../{bubble_accent.xml => bubble_future.xml}    |  2 +-
 .../main/res/layout/fragment_link_exchange.xml  | 10 +++++-----
 .../src/main/res/layout/fragment_nickname.xml   |  6 +++---
 .../src/main/res/values-night/color.xml         |  7 +++++++
 briar-android/src/main/res/values/color.xml     | 17 +++++++++++++++++
 briar-android/src/main/res/values/styles.xml    |  9 +++++----
 8 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 briar-android/src/main/res/drawable/bubble_current.xml
 rename briar-android/src/main/res/drawable/{bubble_accent.xml => bubble_future.xml} (77%)

diff --git a/briar-android/src/main/res/drawable/bubble_completed.xml b/briar-android/src/main/res/drawable/bubble_completed.xml
index 5fab3f0e8..2e4e30055 100644
--- a/briar-android/src/main/res/drawable/bubble_completed.xml
+++ b/briar-android/src/main/res/drawable/bubble_completed.xml
@@ -7,7 +7,7 @@
 		android:radius="32dp"/>
 
 	<solid
-		android:color="@color/briar_lime_600"/>
+		android:color="@color/step_bubble_completed_background"/>
 
 </shape>
 
diff --git a/briar-android/src/main/res/drawable/bubble_current.xml b/briar-android/src/main/res/drawable/bubble_current.xml
new file mode 100644
index 000000000..e74b8e3ed
--- /dev/null
+++ b/briar-android/src/main/res/drawable/bubble_current.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+
+	<corners
+		android:radius="32dp"/>
+
+	<solid
+		android:color="@color/step_bubble_current_background"/>
+
+</shape>
+
diff --git a/briar-android/src/main/res/drawable/bubble_accent.xml b/briar-android/src/main/res/drawable/bubble_future.xml
similarity index 77%
rename from briar-android/src/main/res/drawable/bubble_accent.xml
rename to briar-android/src/main/res/drawable/bubble_future.xml
index 959efaa82..55deccd4d 100644
--- a/briar-android/src/main/res/drawable/bubble_accent.xml
+++ b/briar-android/src/main/res/drawable/bubble_future.xml
@@ -7,7 +7,7 @@
 		android:radius="32dp"/>
 
 	<solid
-		android:color="@color/briar_accent"/>
+		android:color="@color/step_bubble_future_background"/>
 
 </shape>
 
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 3e9b7c708..638612a1c 100644
--- a/briar-android/src/main/res/layout/fragment_link_exchange.xml
+++ b/briar-android/src/main/res/layout/fragment_link_exchange.xml
@@ -49,7 +49,7 @@
 				android:layout_height="1dp"
 				android:layout_margin="16dp"
 				android:alpha="0.5"
-				android:background="@color/briar_accent"
+				android:background="@color/step_bubble_current_background"
 				app:layout_constraintBottom_toBottomOf="@+id/stepOne"
 				app:layout_constraintEnd_toStartOf="@+id/stepTwo"
 				app:layout_constraintStart_toEndOf="@+id/stepOne"
@@ -94,12 +94,12 @@
 				android:layout_width="38dp"
 				android:layout_height="38dp"
 				android:layout_marginTop="8dp"
-				android:background="@drawable/bubble_accent"
+				android:background="@drawable/bubble_current"
 				android:scaleType="center"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@+id/imageView"
 				app:srcCompat="@drawable/ic_call_made"
-				app:tint="@android:color/white" />
+				app:tint="@color/step_bubble_current_foreground" />
 
 			<TextView
 				android:id="@+id/yourLink"
@@ -166,12 +166,12 @@
 				android:layout_width="38dp"
 				android:layout_height="38dp"
 				android:layout_marginTop="16dp"
-				android:background="@drawable/bubble_accent"
+				android:background="@drawable/bubble_current"
 				android:scaleType="center"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@+id/copyButton"
 				app:srcCompat="@drawable/ic_call_received"
-				app:tint="@android:color/white" />
+				app:tint="@color/step_bubble_current_foreground" />
 
 			<TextView
 				android:id="@+id/inputLink"
diff --git a/briar-android/src/main/res/layout/fragment_nickname.xml b/briar-android/src/main/res/layout/fragment_nickname.xml
index 3d614968a..b6e7e07ff 100644
--- a/briar-android/src/main/res/layout/fragment_nickname.xml
+++ b/briar-android/src/main/res/layout/fragment_nickname.xml
@@ -49,7 +49,7 @@
 				android:layout_width="0dp"
 				android:layout_height="1dp"
 				android:layout_margin="16dp"
-				android:background="@color/briar_accent"
+				android:background="@color/step_bubble_current_background"
 				app:layout_constraintBottom_toBottomOf="@+id/stepOne"
 				app:layout_constraintEnd_toStartOf="@+id/stepTwo"
 				app:layout_constraintStart_toEndOf="@+id/stepOne"
@@ -96,13 +96,13 @@
 				android:layout_width="38dp"
 				android:layout_height="38dp"
 				android:layout_marginTop="32dp"
-				android:background="@drawable/bubble_accent"
+				android:background="@drawable/bubble_current"
 				android:scaleType="center"
 				app:layout_constraintBottom_toTopOf="@+id/contactNameLayout"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@+id/imageView"
 				app:srcCompat="@drawable/ic_person"
-				app:tint="@android:color/white" />
+				app:tint="@color/step_bubble_current_foreground" />
 
 			<TextView
 				android:id="@+id/nicknameIntro"
diff --git a/briar-android/src/main/res/values-night/color.xml b/briar-android/src/main/res/values-night/color.xml
index 252b8fe78..67e6ef45e 100644
--- a/briar-android/src/main/res/values-night/color.xml
+++ b/briar-android/src/main/res/values-night/color.xml
@@ -31,6 +31,13 @@
 	<color name="il_orange">@color/briar_orange_400</color>
 	<color name="il_red">@color/briar_red_500_new</color>
 
+	<color name="step_bubble_completed_background">@color/briar_blue_800_new</color>
+	<color name="step_bubble_completed_foreground">@color/briar_blue_300</color>
+	<color name="step_bubble_current_background">@color/briar_blue_400_new</color>
+	<color name="step_bubble_current_foreground">@color/briar_blue_900</color>
+	<color name="step_bubble_future_background">@color/briar_night_700_new</color>
+	<color name="step_bubble_future_foreground">@color/briar_night_100</color>
+
 	<color name="md_theme_onBackground">#E0E4D2</color>
 	<color name="md_theme_onSurface">#E0E4D2</color>
 	<color name="md_theme_error">@color/briar_red_400</color>
diff --git a/briar-android/src/main/res/values/color.xml b/briar-android/src/main/res/values/color.xml
index 62ad17f2a..063d5619a 100644
--- a/briar-android/src/main/res/values/color.xml
+++ b/briar-android/src/main/res/values/color.xml
@@ -7,9 +7,15 @@
 	<color name="briar_lime_400">#82c91e</color>
 	<color name="briar_lime_400_new">#A3E635</color>
 
+	<color name="briar_blue_900">#184080</color>
 	<color name="briar_blue_800">#134a81</color>
+	<color name="briar_blue_800_new">#1649A0</color>
 	<color name="briar_blue_600">#1b69b6</color>
+	<color name="briar_blue_600_new">#196FDE</color>
 	<color name="briar_blue_400">#418cd8</color>
+	<color name="briar_blue_400_new">#52ADF9</color>
+	<color name="briar_blue_300">#8BCAFD</color>
+	<color name="briar_blue_100">#DDEDFE</color>
 
 	<color name="briar_orange_200">#fed69f</color>
 	<color name="briar_orange_400">#FBBF24</color>
@@ -24,14 +30,18 @@
 	<color name="briar_night_950">#0e171f</color>
 	<color name="briar_night_800">#212d3b</color>
 	<color name="briar_night_700">#2e3d4f</color>
+	<color name="briar_night_700_new">#334155</color>
 	<color name="briar_night_600">#475569</color>
 	<color name="briar_night_500">#435b77</color>
+	<color name="briar_night_100">#F1F5F9</color>
 	<color name="briar_night_50">#ebf3fa</color>
 
 	<color name="briar_gray_900">#2e2e2e</color>
+	<color name="briar_gray_700">#374151</color>
 	<color name="briar_gray_500">#a7a7a7</color>
 	<color name="briar_gray_300">#cccccc</color>
 	<color name="briar_gray_200">#dfdfdf</color>
+	<color name="briar_gray_200_new">#E5E7EB</color>
 	<color name="briar_gray_100">#f2f2f2</color>
 
 	<color name="briar_brand_blue">@color/briar_night_700</color>
@@ -68,6 +78,13 @@
 	<color name="il_orange">@color/briar_orange_500_new</color>
 	<color name="il_red">@color/briar_red_600</color>
 
+	<color name="step_bubble_completed_background">@color/briar_blue_100</color>
+	<color name="step_bubble_completed_foreground">@color/briar_blue_600_new</color>
+	<color name="step_bubble_current_background">@color/briar_blue_600_new</color>
+	<color name="step_bubble_current_foreground">@android:color/white</color>
+	<color name="step_bubble_future_background">@color/briar_gray_200_new</color>
+	<color name="step_bubble_future_foreground">@color/briar_gray_700</color>
+
 	<!-- text colors -->
 	<color name="briar_text_link">@color/briar_blue_400</color>
 	<color name="briar_text_link_inverse">@android:color/white</color>
diff --git a/briar-android/src/main/res/values/styles.xml b/briar-android/src/main/res/values/styles.xml
index 35c338d13..7b02d5f2b 100644
--- a/briar-android/src/main/res/values/styles.xml
+++ b/briar-android/src/main/res/values/styles.xml
@@ -146,20 +146,21 @@
 	<style name="StepBubble">
 		<item name="android:layout_width">28dp</item>
 		<item name="android:layout_height">28dp</item>
-		<!-- FIXME in dark theme accent is same color as StepBubble.Completed -->
-		<item name="android:background">@drawable/bubble_accent</item>
+		<item name="android:background">@drawable/bubble_current</item>
 		<item name="android:gravity">center</item>
-		<item name="android:textColor">@android:color/white</item>
+		<item name="android:textColor">@color/step_bubble_current_foreground</item>
 		<item name="android:textSize">18sp</item>
 	</style>
 
 	<style name="StepBubble.Upcoming">
-		<item name="android:alpha">0.5</item>
+		<item name="android:background">@drawable/bubble_future</item>
+		<item name="android:textColor">@color/step_bubble_future_foreground</item>
 	</style>
 
 	<style name="StepBubble.Completed">
 		<item name="android:background">@drawable/bubble_completed</item>
 		<item name="android:scaleType">center</item>
+		<item name="tint">@color/step_bubble_completed_foreground</item>
 		<item name="srcCompat">@drawable/ic_check_white</item>
 	</style>