Merge branch 'style-guide-colours' into 'master'

Use colours from style guide

See merge request briar/briar!1257

briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java

@@ -164,7 +164,7 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 		nc.setLockscreenVisibility(VISIBILITY_SECRET);
 		nc.enableVibration(true);
 		nc.enableLights(true);
-		nc.setLightColor(getColor(appContext, R.color.briar_green_light));
+		nc.setLightColor(getColor(appContext, R.color.briar_lime_400));
 		notificationManager.createNotificationChannel(nc);
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java

@@ -76,7 +76,7 @@ public class PendingContactListActivity extends BriarActivity
 		list.showProgressBar();
 
 		offlineSnackbar = new BriarSnackbarBuilder()
-				.setBackgroundColor(R.color.briar_red)
+				.setBackgroundColor(R.color.briar_red_500)
 				.make(list, R.string.offline_state, LENGTH_INDEFINITE);
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java

@@ -46,11 +46,11 @@ class PendingContactViewHolder extends ViewHolder {
 		});
 
 		int color = ContextCompat
-				.getColor(status.getContext(), R.color.briar_green);
+				.getColor(status.getContext(), R.color.briar_lime_600);
 		switch (item.getState()) {
 			case WAITING_FOR_CONNECTION:
-				color = ContextCompat
+				color = ContextCompat.getColor(status.getContext(),
-						.getColor(status.getContext(), R.color.briar_yellow);
+						R.color.briar_orange_500);
 				status.setText(R.string.waiting_for_contact_to_come_online);
 				break;
 			case OFFLINE:
@@ -64,7 +64,7 @@ class PendingContactViewHolder extends ViewHolder {
 				break;
 			case FAILED:
 				color = ContextCompat
-						.getColor(status.getContext(), R.color.briar_red);
+						.getColor(status.getContext(), R.color.briar_red_500);
 				status.setText(R.string.adding_contact_failed);
 				break;
 			default:

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java

@@ -41,7 +41,8 @@ class ConversationMessageViewHolder extends ConversationItemViewHolder {
 
 		// remember original status text color
 		timeColor = time.getCurrentTextColor();
-		timeColorBubble = getColor(v.getContext(), R.color.briar_white);
+		timeColorBubble =
+				getColor(v.getContext(), R.color.msg_status_bubble_foreground);
 
 		// clone constraint sets from layout files
 		textConstraints.clone(v.getContext(),

briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java

@@ -299,7 +299,7 @@ public class ImageActivity extends BriarActivity
 		int stringRes = error ?
 				R.string.save_image_error : R.string.save_image_success;
 		int colorRes = error ?
-				R.color.briar_red : R.color.briar_primary;
+				R.color.briar_red_500 : R.color.briar_primary;
 		new BriarSnackbarBuilder()
 				.setBackgroundColor(colorRes)
 				.make(layout, stringRes, LENGTH_LONG)

briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java

@@ -432,8 +432,8 @@ public class NavDrawerActivity extends BriarActivity implements
 
 	@ColorRes
 	private int getIconColor(State state) {
-		if (state == ACTIVE) return R.color.briar_green_light;
+		if (state == ACTIVE) return R.color.briar_lime_400;
-		else if (state == ENABLING) return R.color.briar_yellow;
+		else if (state == ENABLING) return R.color.briar_orange_500;
 		else return android.R.color.tertiary_text_light;
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/util/BriarNotificationBuilder.java

@@ -20,7 +20,7 @@ public class BriarNotificationBuilder extends NotificationCompat.Builder {
 		// https://issuetracker.google.com/issues/36961721
 		setAutoCancel(true);
 
-		setLights(ContextCompat.getColor(context, R.color.briar_green_light),
+		setLights(ContextCompat.getColor(context, R.color.briar_lime_400),
 				750, 500);
 		if (SDK_INT >= 21) setVisibility(VISIBILITY_PRIVATE);
 	}

briar-android/src/main/res/drawable-night/contact_connected.xml

@@ -11,7 +11,7 @@
 C7.58,20,4,16.42,4,12 S7.58,4,12,4 S20,7.58,20,12 S16.42,20,12,20 Z"/>
 
 	<path
-		android:fillColor="#95d220"
+		android:fillColor="#82c91e"
 		android:pathData="M10.8972,19.9503 C6.5514,19.3493,3.43091,15.2154,4.0625,10.896
 C4.55452,7.53099,7.09451,4.8236,10.394,4.14714
 C14.2569,3.35517,18.1698,5.54347,19.5236,9.25295

briar-android/src/main/res/drawable-night/qr_code_explanation.xml

@@ -17,12 +17,12 @@
 		android:fillColor="#ffffff"
 		android:pathData="M175.3 16.5l-9.8 0 0 -5.7c0 -1.4 -1.2 -2.6 -2.6 -2.6l-19.3 0c-1.4 0 -2.6 1.2 -2.6 2.6l0 14.4c0 1.4 1.2 2.6 2.6 2.6l15.1 0 0 17.3c0 2.4 2 4.4 4.4 4.4l12.2 0c2.4 0 4.4 -2 4.4 -4.4l0 -24.2c0.1 -2.4 -1.9 -4.4 -4.4 -4.4zm-12.4 -5.9l-9.6 6 -9.6 -6 19.2 0zm-19.4 14.8l0 -12.3 9.8 6.1 9.8 -6.1 0 12.3 -19.6 0zm28.6 21.2l-5.8 0 0 -1.5 5.8 0 0 1.5zm5 -4.6l-15.8 0 0 -14.2 1.6 0c1.4 0 2.6 -1.2 2.6 -2.6l0 -4.1 11.6 0 0 20.9z"/>
 	<path
-		android:fillColor="#ff0000"
+		android:fillColor="#db3b21"
 		android:pathData="M101.4 17.8l2 2 7.4 -7.3 7.3 7.3 2.1 -2 -7.4 -7.4 7.4 -7.3 -2.1 -2.1 -7.3 7.4 -7.4 -7.4 -2 2.1 7.3 7.3z"/>
 	<path
-		android:fillColor="#ff0000"
+		android:fillColor="#db3b21"
 		android:pathData="M176 17.8l2.1 2 7.3 -7.3 7.4 7.3 2 -2 -7.3 -7.4 7.3 -7.3 -2 -2.1 -7.4 7.4 -7.3 -7.4 -2.1 2.1 7.3 7.3z"/>
 	<path
-		android:fillColor="#08b124"
+		android:fillColor="#67a60f"
 		android:pathData="M35.8 18.8l0 0L52.5 2.1 50.5 0 35.6 14.8 28.5 7.7l-2.1 2.1 9.2 9.1z"/>
 </vector>

briar-android/src/main/res/drawable/bubble_completed.xml

@@ -7,7 +7,7 @@
 		android:radius="32dp"/>
 
 	<solid
-		android:color="@color/briar_green"/>
+		android:color="@color/briar_lime_600"/>
 
 </shape>
 

briar-android/src/main/res/drawable/contact_connected.xml

@@ -13,7 +13,7 @@ C7.58,20,4,16.42,4,12 S7.58,4,12,4 S20,7.58,20,12 S16.42,20,12,20 Z"/>
 	<path
 		android:pathData="M0,0 L24,0 L24,24 L0,24 Z"/>
 	<path
-		android:fillColor="#95d220"
+		android:fillColor="#82c91e"
 		android:pathData="M10.8972,19.9503 C6.5514,19.3493,3.43091,15.2154,4.0625,10.896
 C4.55452,7.53099,7.09451,4.8236,10.394,4.14714
 C14.2569,3.35517,18.1698,5.54347,19.5236,9.25295

briar-android/src/main/res/drawable/contact_offline.xml

@@ -6,7 +6,7 @@
         android:viewportWidth="24">
 
 	<path
-		android:fillColor="#2D3E50"
+		android:fillColor="#2e3d4f"
 		android:pathData="M10.8972,19.9503 C6.5514,19.3493,3.43091,15.2154,4.0625,10.896
 C4.55452,7.53099,7.09451,4.8236,10.394,4.14714
 C14.2569,3.35517,18.1698,5.54347,19.5236,9.25295

briar-android/src/main/res/drawable/contact_online.xml

@@ -6,7 +6,7 @@
         android:viewportWidth="24">
 
 	<path
-		android:fillColor="#95D220"
+		android:fillColor="#82c91e"
 		android:pathData="M10.8972,19.9503 C6.5514,19.3493,3.43091,15.2154,4.0625,10.896
 C4.55452,7.53099,7.09451,4.8236,10.394,4.14714
 C14.2569,3.35517,18.1698,5.54347,19.5236,9.25295

briar-android/src/main/res/drawable/ic_content_copy.xml

@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:tint="#2A93C6"
+        android:tint="#418cd8"
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
 	<path

briar-android/src/main/res/drawable/ic_content_paste.xml

@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:tint="#2A93C6"
+        android:tint="#418cd8"
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
 	<path

briar-android/src/main/res/drawable/ic_image_broken.xml

@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
 	<path
-		android:fillColor="#808080"
+		android:fillColor="#707070"
 		android:pathData="M21,5v6.59l-3,-3.01 -4,4.01 -4,-4 -4,4 -3,-3.01L3,5c0,-1.1 0.9,-2 2,-2h14c1.1,0 2,0.9 2,2zM18,11.42l3,3.01L21,19c0,1.1 -0.9,2 -2,2L5,21c-1.1,0 -2,-0.9 -2,-2v-6.58l3,2.99 4,-4 4,4 4,-3.99z"/>
 </vector>

briar-android/src/main/res/drawable/ic_more_vert_accent.xml

@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
 	<path
-		android:fillColor="#FF2D3E50"
+		android:fillColor="#2e3d4f"
 		android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
 </vector>

briar-android/src/main/res/drawable/ic_rss_feed.xml

@@ -6,7 +6,7 @@
         android:viewportWidth="30">
 
 	<path
-		android:fillColor="#ffa500"
+		android:fillColor="#fc9403"
 		android:pathData="M0,0 L30,0 L30,30 L0,30 L0,0 Z"/>
 	<path
 		android:fillColor="#ffffff"

briar-android/src/main/res/drawable/qr_code_explanation.xml

@@ -18,12 +18,12 @@
 		android:fillColor="#000000"
 		android:pathData="M175.3 16.5l-9.8 0 0 -5.7c0 -1.4 -1.2 -2.6 -2.6 -2.6l-19.3 0c-1.4 0 -2.6 1.2 -2.6 2.6l0 14.4c0 1.4 1.2 2.6 2.6 2.6l15.1 0 0 17.3c0 2.4 2 4.4 4.4 4.4l12.2 0c2.4 0 4.4 -2 4.4 -4.4l0 -24.2c0.1 -2.4 -1.9 -4.4 -4.4 -4.4zm-12.4 -5.9l-9.6 6 -9.6 -6 19.2 0zm-19.4 14.8l0 -12.3 9.8 6.1 9.8 -6.1 0 12.3 -19.6 0zm28.6 21.2l-5.8 0 0 -1.5 5.8 0 0 1.5zm5 -4.6l-15.8 0 0 -14.2 1.6 0c1.4 0 2.6 -1.2 2.6 -2.6l0 -4.1 11.6 0 0 20.9z"/>
 	<path
-		android:fillColor="#ff0000"
+		android:fillColor="#db3b21"
 		android:pathData="M101.4 17.8l2 2 7.4 -7.3 7.3 7.3 2.1 -2 -7.4 -7.4 7.4 -7.3 -2.1 -2.1 -7.3 7.4 -7.4 -7.4 -2 2.1 7.3 7.3z"/>
 	<path
-		android:fillColor="#ff0000"
+		android:fillColor="#db3b21"
 		android:pathData="M176 17.8l2.1 2 7.3 -7.3 7.4 7.3 2 -2 -7.3 -7.4 7.3 -7.3 -2 -2.1 -7.4 7.4 -7.3 -7.4 -2.1 2.1 7.3 7.3z"/>
 	<path
-		android:fillColor="#08b124"
+		android:fillColor="#67a60f"
 		android:pathData="M35.8 18.8l0 0L52.5 2.1 50.5 0 35.6 14.8 28.5 7.7l-2.1 2.1 9.2 9.1z"/>
 </vector>

briar-android/src/main/res/drawable/social_share_blue.xml

@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:tint="#2A93C6"
+        android:tint="#418cd8"
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
 	<path

briar-android/src/main/res/drawable/trust_indicator_anonymous.xml

@@ -5,7 +5,7 @@
         android:viewportHeight="20"
         android:viewportWidth="49">
 	<path
-		android:fillColor="#b7b7b7"
+		android:fillColor="#a7a7a7"
 		android:pathData="M15.5002,13.8797 L15.5002,11.8208 L12.9502,11.8208 L12.9502,8.38194
 L15.5002,8.38194 L15.5002,6.32312 L12.9502,6.32312 L12.9502,2.49959
 L10.5752,2.49959 L10.5752,6.32312 L7.42514,6.32312 L7.42514,2.49959
@@ -16,7 +16,7 @@ L10.5752,13.8797 L10.5752,17.4996 L12.9502,17.4996 L12.9502,13.8797
 L15.5002,13.8797 Z M10.5752,11.8208 L7.42514,11.8208 L7.42514,8.38194
 L10.5752,8.38194 L10.5752,11.8208 Z"/>
 	<path
-		android:fillColor="#b7b7b7"
+		android:fillColor="#a7a7a7"
 		android:pathData="M31.0002,13.8797 L31.0002,11.8208 L28.4502,11.8208 L28.4502,8.38194
 L31.0002,8.38194 L31.0002,6.32312 L28.4502,6.32312 L28.4502,2.49959
 L26.0752,2.49959 L26.0752,6.32312 L22.9251,6.32312 L22.9251,2.49959
@@ -27,7 +27,7 @@ L26.0752,13.8797 L26.0752,17.4996 L28.4502,17.4996 L28.4502,13.8797
 L31.0002,13.8797 Z M26.0752,11.8208 L22.9251,11.8208 L22.9251,8.38194
 L26.0752,8.38194 L26.0752,11.8208 Z"/>
 	<path
-		android:fillColor="#b7b7b7"
+		android:fillColor="#a7a7a7"
 		android:pathData="M46.5002,13.8797 L46.5002,11.8208 L43.9502,11.8208 L43.9502,8.38194
 L46.5002,8.38194 L46.5002,6.32312 L43.9502,6.32312 L43.9502,2.49959
 L41.5752,2.49959 L41.5752,6.32312 L38.4251,6.32312 L38.4251,2.49959

briar-android/src/main/res/drawable/trust_indicator_unknown.xml

@@ -5,7 +5,7 @@
         android:viewportHeight="20"
         android:viewportWidth="49">
 	<path
-		android:fillColor="#c34032"
+		android:fillColor="#db3b21"
 		android:pathData="M15.5002,13.8797 L15.5002,11.8208 L12.9502,11.8208 L12.9502,8.38194
 L15.5002,8.38194 L15.5002,6.32312 L12.9502,6.32312 L12.9502,2.49959
 L10.5752,2.49959 L10.5752,6.32312 L7.42514,6.32312 L7.42514,2.49959
@@ -16,7 +16,7 @@ L10.5752,13.8797 L10.5752,17.4996 L12.9502,17.4996 L12.9502,13.8797
 L15.5002,13.8797 Z M10.5752,11.8208 L7.42514,11.8208 L7.42514,8.38194
 L10.5752,8.38194 L10.5752,11.8208 Z"/>
 	<path
-		android:fillColor="#b7b7b7"
+		android:fillColor="#a7a7a7"
 		android:pathData="M31.0002,13.8797 L31.0002,11.8208 L28.4502,11.8208 L28.4502,8.38194
 L31.0002,8.38194 L31.0002,6.32312 L28.4502,6.32312 L28.4502,2.49959
 L26.0752,2.49959 L26.0752,6.32312 L22.9251,6.32312 L22.9251,2.49959
@@ -27,7 +27,7 @@ L26.0752,13.8797 L26.0752,17.4996 L28.4502,17.4996 L28.4502,13.8797
 L31.0002,13.8797 Z M26.0752,11.8208 L22.9251,11.8208 L22.9251,8.38194
 L26.0752,8.38194 L26.0752,11.8208 Z"/>
 	<path
-		android:fillColor="#b7b7b7"
+		android:fillColor="#a7a7a7"
 		android:pathData="M46.5002,13.8797 L46.5002,11.8208 L43.9502,11.8208 L43.9502,8.38194
 L46.5002,8.38194 L46.5002,6.32312 L43.9502,6.32312 L43.9502,2.49959
 L41.5752,2.49959 L41.5752,6.32312 L38.4251,6.32312 L38.4251,2.49959

briar-android/src/main/res/drawable/trust_indicator_unverified.xml

@@ -5,7 +5,7 @@
         android:viewportHeight="20"
         android:viewportWidth="49">
 	<path
-		android:fillColor="#fcd53a"
+		android:fillColor="#fc9403"
 		android:pathData="M15.5002,13.8797 L15.5002,11.8208 L12.9502,11.8208 L12.9502,8.38194
 L15.5002,8.38194 L15.5002,6.32312 L12.9502,6.32312 L12.9502,2.49959
 L10.5752,2.49959 L10.5752,6.32312 L7.42514,6.32312 L7.42514,2.49959
@@ -16,7 +16,7 @@ L10.5752,13.8797 L10.5752,17.4996 L12.9502,17.4996 L12.9502,13.8797
 L15.5002,13.8797 Z M10.5752,11.8208 L7.42514,11.8208 L7.42514,8.38194
 L10.5752,8.38194 L10.5752,11.8208 Z"/>
 	<path
-		android:fillColor="#fcd53a"
+		android:fillColor="#fc9403"
 		android:pathData="M31.0002,13.8797 L31.0002,11.8208 L28.4502,11.8208 L28.4502,8.38194
 L31.0002,8.38194 L31.0002,6.32312 L28.4502,6.32312 L28.4502,2.49959
 L26.0752,2.49959 L26.0752,6.32312 L22.9251,6.32312 L22.9251,2.49959
@@ -27,7 +27,7 @@ L26.0752,13.8797 L26.0752,17.4996 L28.4502,17.4996 L28.4502,13.8797
 L31.0002,13.8797 Z M26.0752,11.8208 L22.9251,11.8208 L22.9251,8.38194
 L26.0752,8.38194 L26.0752,11.8208 Z"/>
 	<path
-		android:fillColor="#b7b7b7"
+		android:fillColor="#a7a7a7"
 		android:pathData="M46.5002,13.8797 L46.5002,11.8208 L43.9502,11.8208 L43.9502,8.38194
 L46.5002,8.38194 L46.5002,6.32312 L43.9502,6.32312 L43.9502,2.49959
 L41.5752,2.49959 L41.5752,6.32312 L38.4251,6.32312 L38.4251,2.49959

briar-android/src/main/res/drawable/trust_indicator_verified.xml

@@ -5,7 +5,7 @@
         android:viewportHeight="20"
         android:viewportWidth="49">
 	<path
-		android:fillColor="#7fac49"
+		android:fillColor="#67a60f"
 		android:pathData="M15.5002,13.8797 L15.5002,11.8208 L12.9502,11.8208 L12.9502,8.38194
 L15.5002,8.38194 L15.5002,6.32312 L12.9502,6.32312 L12.9502,2.49959
 L10.5752,2.49959 L10.5752,6.32312 L7.42514,6.32312 L7.42514,2.49959
@@ -16,7 +16,7 @@ L10.5752,13.8797 L10.5752,17.4996 L12.9502,17.4996 L12.9502,13.8797
 L15.5002,13.8797 Z M10.5752,11.8208 L7.42514,11.8208 L7.42514,8.38194
 L10.5752,8.38194 L10.5752,11.8208 Z"/>
 	<path
-		android:fillColor="#7fac49"
+		android:fillColor="#67a60f"
 		android:pathData="M31.0002,13.8797 L31.0002,11.8208 L28.4502,11.8208 L28.4502,8.38194
 L31.0002,8.38194 L31.0002,6.32312 L28.4502,6.32312 L28.4502,2.49959
 L26.0752,2.49959 L26.0752,6.32312 L22.9251,6.32312 L22.9251,2.49959
@@ -27,7 +27,7 @@ L26.0752,13.8797 L26.0752,17.4996 L28.4502,17.4996 L28.4502,13.8797
 L31.0002,13.8797 Z M26.0752,11.8208 L22.9251,11.8208 L22.9251,8.38194
 L26.0752,8.38194 L26.0752,11.8208 Z"/>
 	<path
-		android:fillColor="#7fac49"
+		android:fillColor="#67a60f"
 		android:pathData="M46.5002,13.8797 L46.5002,11.8208 L43.9502,11.8208 L43.9502,8.38194
 L46.5002,8.38194 L46.5002,6.32312 L43.9502,6.32312 L43.9502,2.49959
 L41.5752,2.49959 L41.5752,6.32312 L38.4251,6.32312 L38.4251,2.49959

briar-android/src/main/res/layout/activity_image.xml

@@ -4,14 +4,13 @@
 	android:id="@+id/layout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:background="@color/briar_black"
+	android:background="@android:color/black"
 	tools:context=".android.conversation.ImageActivity">
 
 	<androidx.viewpager.widget.ViewPager
 		android:id="@+id/viewPager"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
+		android:layout_height="match_parent" />
-		tools:background="@color/briar_green_light" />
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appBarLayout"

briar-android/src/main/res/layout/fragment_link_dialog.xml

@@ -60,7 +60,7 @@
 				android:layout_gravity="center_vertical"
 				android:layout_marginTop="16dp"
 				android:layout_marginBottom="16dp"
-				android:background="@color/briar_white"
+				android:background="@android:color/white"
 				android:padding="8dp"
 				android:textColor="@color/briar_text_primary"
 				android:textIsSelectable="true"

briar-android/src/main/res/layout/fragment_link_exchange.xml

@@ -84,7 +84,7 @@
 			android:src="@drawable/ic_call_made"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/stepOneText"
-			app:tint="@color/briar_white" />
+			app:tint="@android:color/white" />
 
 		<TextView
 			android:id="@+id/yourLink"
@@ -105,7 +105,7 @@
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="16dp"
-			android:background="@color/briar_white"
+			android:background="@android:color/white"
 			android:ellipsize="end"
 			android:padding="8dp"
 			android:singleLine="true"
@@ -160,7 +160,7 @@
 			android:src="@drawable/ic_call_received"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/copyButton"
-			app:tint="@color/briar_white" />
+			app:tint="@android:color/white" />
 
 		<TextView
 			android:id="@+id/inputLink"

briar-android/src/main/res/layout/fragment_nickname.xml

@@ -97,7 +97,7 @@
 			app:layout_constraintBottom_toTopOf="@+id/contactNameLayout"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/imageView"
-			app:tint="@color/briar_white" />
+			app:tint="@android:color/white" />
 
 		<TextView
 			android:id="@+id/nicknameIntro"

briar-android/src/main/res/layout/list_item_pending_contact.xml

@@ -60,7 +60,7 @@
 		app:layout_constraintEnd_toStartOf="@+id/time"
 		app:layout_constraintStart_toStartOf="@+id/name"
 		app:layout_constraintTop_toBottomOf="@+id/name"
-		tools:textColor="@color/briar_red" />
+		tools:textColor="@color/briar_red_500" />
 
 	<TextView
 		android:id="@+id/time"

briar-android/src/main/res/values-night/color.xml

@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<color name="briar_primary">@color/briar_blue_dark</color>
+	<color name="briar_primary">@color/briar_night_800</color>
-	<color name="briar_accent">@color/briar_green</color>
+	<color name="briar_accent">@color/briar_lime_600</color>
 
 	<color name="preference_category">@color/briar_accent</color>
-	<color name="preference_category_background">@color/briar_black_almost</color>
+	<color name="preference_category_background">@color/briar_night_950</color>
 
-	<color name="color_primary">@color/briar_white</color>
+	<color name="color_primary">@android:color/white</color>
 
-	<color name="msg_in">@color/briar_blue</color>
+	<color name="msg_in">@color/briar_night_700</color>
-	<color name="msg_out">@color/briar_blue_elio_light</color>
+	<color name="msg_out">@color/briar_blue_600</color>
-	<color name="notice_in">@color/briar_blue_dark</color>
+	<color name="notice_in">@color/briar_night_800</color>
-	<color name="notice_out">@color/briar_blue_elio</color>
+	<color name="notice_out">@color/briar_blue_800</color>
 	<color name="msg_stroke">@color/msg_stroke_dark</color>
 
-	<color name="window_background">@color/briar_blue_very_dark</color>
+	<color name="window_background">@color/briar_night_950</color>
-	<color name="card_background">@color/briar_blue_dark</color>
+	<color name="card_background">@color/briar_night_800</color>
-	<color name="item_background_highlight">@color/briar_blue</color>
+	<color name="item_background_highlight">@color/briar_night_700</color>
 
-	<color name="briar_button_background_color">@color/briar_blue_medium</color>
+	<color name="briar_button_background_color">@color/briar_night_500</color>
-	<color name="briar_button_text_neutral">@color/briar_blue_light</color>
+	<color name="briar_button_text_neutral">@color/briar_blue_400</color>
 	<color name="briar_button_text_disabled">#23cccccc</color>
 
-	<color name="thread_indicator">@color/briar_blue</color>
+	<color name="thread_indicator">@color/briar_night_700</color>
-	<color name="thread_item_highlight">@color/briar_black</color>
+	<color name="thread_item_highlight">@android:color/black</color>
 
-	<color name="divider">@color/briar_black</color>
+	<color name="divider">@android:color/black</color>
 </resources>

briar-android/src/main/res/values/color.xml

@@ -1,68 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<color name="briar_blue">#2D3E50</color>
+	<color name="briar_lime_600">#67a60f</color>
-	<color name="briar_blue_dark">#222E3C</color>
+	<color name="briar_lime_400">#82c91e</color>
-	<color name="briar_blue_very_dark">#0F1720</color>
-	<color name="briar_blue_medium">#4F6C8C</color>
-	<color name="briar_blue_elio">#236087</color>
-	<color name="briar_blue_elio_light">#3C80A9</color>
-	<color name="briar_blue_light">#2A93C6</color>
-	<color name="briar_blue_grey">#EBEFF2</color>
-	<color name="briar_yellow">#9e9d24</color>
-	<color name="briar_green">#5C940D</color>
-	<color name="briar_green_light">#95D220</color>
-	<color name="briar_red">#ff0000</color>
-	<color name="briar_white">#FFFFFF</color>
-	<color name="briar_black">#000000</color>
-	<color name="briar_black_almost">#080C10</color>
 
-	<color name="m_grey_300">#e0e0e0</color>
+	<color name="briar_blue_800">#134a81</color>
-	<color name="m_grey_500">#9e9e9e</color>
+	<color name="briar_blue_600">#1b69b6</color>
-	<color name="m_blue_grey_50">#eceff1</color>
+	<color name="briar_blue_400">#418cd8</color>
 
-	<color name="briar_primary">@color/briar_blue</color>
+	<color name="briar_orange_500">#fc9403</color>
-	<color name="briar_primary_dark">@color/briar_blue_very_dark</color>
-	<color name="briar_accent">@color/briar_blue</color>
 
-	<color name="window_background">#EBEBEB</color>
+	<color name="briar_red_500">#db3b21</color>
+
+	<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_500">#435b77</color>
+	<color name="briar_night_50">#ebf3fa</color>
+
+	<color name="briar_gray_900">#2e2e2e</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_100">#f2f2f2</color>
+
+	<color name="briar_brand_blue">@color/briar_night_700</color>
+	<color name="briar_brand_green">@color/briar_lime_400</color>
+
+	<color name="briar_primary">@color/briar_brand_blue</color>
+	<color name="briar_primary_dark">@color/briar_night_950</color>
+	<color name="briar_accent">@color/briar_brand_blue</color>
+
+	<color name="window_background">@color/briar_gray_100</color>
 	<color name="card_background">@color/cardview_light_background</color>
-	<color name="item_background_highlight">#DCDCDC</color>
+	<color name="item_background_highlight">@color/briar_gray_200</color>
-	<color name="briar_warning_background">@color/briar_red</color>
+	<color name="briar_warning_background">@color/briar_red_500</color>
-	<color name="action_bar_text">@color/briar_white</color>
+	<color name="action_bar_text">@android:color/white</color>
-	<color name="private_message_date_inverse">@color/m_grey_300</color>
+	<color name="private_message_date_inverse">@color/briar_gray_200</color>
 	<color name="forum_avatar_shadow">#99000000</color>
 
 	<color name="color_primary">#dd000000</color>
 
-	<color name="msg_in">@color/briar_white</color>
+	<color name="msg_in">@android:color/white</color>
-	<color name="msg_out">@color/briar_blue_elio_light</color>
+	<color name="msg_out">@color/briar_blue_400</color>
-	<color name="notice_in">@color/briar_blue_grey</color>
+	<color name="notice_in">@color/briar_night_50</color>
-	<color name="notice_out">@color/briar_blue_elio</color>
+	<color name="notice_out">@color/briar_blue_600</color>
-	<color name="msg_stroke_light">#cbcbcb</color>
+	<color name="msg_stroke_light">@color/briar_gray_300</color>
-	<color name="msg_stroke_dark">#333333</color>
+	<color name="msg_stroke_dark">@color/briar_gray_900</color>
 	<color name="msg_stroke">@color/msg_stroke_light</color>
 	<color name="msg_status_bubble_background">#66000000</color>
+	<color name="msg_status_bubble_foreground">@android:color/white</color>
 	<color name="msg_selected_background">@color/briar_accent</color>
 
 	<!-- text colors -->
-	<color name="briar_text_link">@color/briar_blue_light</color>
+	<color name="briar_text_link">@color/briar_blue_400</color>
 	<color name="briar_text_primary">#df000000</color>
-	<color name="briar_text_primary_inverse">@color/briar_white</color>
+	<color name="briar_text_primary_inverse">@android:color/white</color>
 	<color name="briar_text_secondary_inverse">#b4ffffff</color>
 	<color name="briar_text_tertiary_inverse">#80ffffff</color>
 
-	<color name="preference_category">@color/briar_blue_medium</color>
+	<color name="preference_category">@color/briar_night_500</color>
 	<color name="preference_category_background">@color/window_background</color>
 
 	<color name="briar_button_background_color">@color/briar_accent</color>
-	<color name="briar_button_text_positive">@color/briar_blue_light</color>
+	<color name="briar_button_text_positive">@color/briar_blue_400</color>
-	<color name="briar_button_text_neutral">@color/briar_blue_medium</color>
+	<color name="briar_button_text_neutral">@color/briar_night_500</color>
-	<color name="briar_button_text_negative">@color/briar_red</color>
+	<color name="briar_button_text_negative">@color/briar_red_500</color>
 	<color name="briar_button_text_disabled">#28000000</color>
 
-	<color name="thread_indicator">@color/m_grey_500</color>
+	<color name="thread_indicator">@color/briar_gray_500</color>
 	<color name="thread_item_background">@color/window_background</color>
-	<color name="thread_item_highlight">@color/briar_white</color>
+	<color name="thread_item_highlight">@android:color/white</color>
 
-	<color name="divider">#c1c1c1</color>
+	<color name="divider">@color/briar_gray_200</color>
 </resources>

briar-android/src/main/res/values/styles.xml

@@ -130,7 +130,7 @@
 		<item name="android:layout_height">28dp</item>
 		<item name="android:background">@drawable/bubble_accent</item>
 		<item name="android:gravity">center</item>
-		<item name="android:textColor">@color/briar_white</item>
+		<item name="android:textColor">@android:color/white</item>
 		<item name="android:textSize">18sp</item>
 	</style>