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 e4d1f3190..a1da1af9d 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 @@ -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); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java index 225096dd9..22aea5294 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java +++ b/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); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java index c824f373a..85dbc52b7 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java +++ b/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 - .getColor(status.getContext(), R.color.briar_yellow); + color = ContextCompat.getColor(status.getContext(), + 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: diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java index 4d6fd43e4..acee25a9f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java +++ b/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(), diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java index 10d2da314..afac73601 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java +++ b/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) 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 3cd9f53a1..2a957d0ee 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 @@ -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; - else if (state == ENABLING) return R.color.briar_yellow; + if (state == ACTIVE) return R.color.briar_lime_400; + else if (state == ENABLING) return R.color.briar_orange_500; else return android.R.color.tertiary_text_light; } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/util/BriarNotificationBuilder.java b/briar-android/src/main/java/org/briarproject/briar/android/util/BriarNotificationBuilder.java index 7783dbe41..b3a4daa6a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/util/BriarNotificationBuilder.java +++ b/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); } diff --git a/briar-android/src/main/res/drawable/bubble_completed.xml b/briar-android/src/main/res/drawable/bubble_completed.xml index 799a93c93..5fab3f0e8 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"/> + android:color="@color/briar_lime_600"/> diff --git a/briar-android/src/main/res/layout/activity_image.xml b/briar-android/src/main/res/layout/activity_image.xml index be5f2f0fd..7fad3979d 100644 --- a/briar-android/src/main/res/layout/activity_image.xml +++ b/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"> + android:layout_height="match_parent" /> + app:tint="@android:color/white" /> + app:tint="@android:color/white" /> + app:tint="@android:color/white" /> + tools:textColor="@color/briar_red_500" /> - @color/briar_blue_dark - @color/briar_green + @color/briar_night_800 + @color/briar_lime_600 @color/briar_accent - @color/briar_black_almost + @color/briar_night_950 - @color/briar_white + @android:color/white - @color/briar_blue - @color/briar_blue_elio_light - @color/briar_blue_dark - @color/briar_blue_elio + @color/briar_night_700 + @color/briar_blue_600 + @color/briar_night_800 + @color/briar_blue_800 @color/msg_stroke_dark - @color/briar_blue_very_dark - @color/briar_blue_dark - @color/briar_blue + @color/briar_night_950 + @color/briar_night_800 + @color/briar_night_700 - @color/briar_blue_medium - @color/briar_blue_light + @color/briar_night_500 + @color/briar_blue_400 #23cccccc - @color/briar_blue - @color/briar_black + @color/briar_night_700 + @android:color/black - @color/briar_black + @android:color/black \ No newline at end of file diff --git a/briar-android/src/main/res/values/color.xml b/briar-android/src/main/res/values/color.xml index dd95be12c..445b204c0 100644 --- a/briar-android/src/main/res/values/color.xml +++ b/briar-android/src/main/res/values/color.xml @@ -1,68 +1,75 @@ - #2D3E50 - #222E3C - #0F1720 - #4F6C8C - #236087 - #3C80A9 - #2A93C6 - #EBEFF2 - #9e9d24 - #5C940D - #95D220 - #ff0000 - #FFFFFF - #000000 - #080C10 + #67a60f + #82c91e - #e0e0e0 - #9e9e9e - #eceff1 + #134a81 + #1b69b6 + #418cd8 - @color/briar_blue - @color/briar_blue_very_dark - @color/briar_blue + #fc9403 - #EBEBEB + #db3b21 + + #0e171f + #212d3b + #2e3d4f + #435b77 + #ebf3fa + + #2e2e2e + #a7a7a7 + #cccccc + #dfdfdf + #f2f2f2 + + @color/briar_night_700 + @color/briar_lime_400 + + @color/briar_brand_blue + @color/briar_night_950 + @color/briar_brand_blue + + @color/briar_gray_100 @color/cardview_light_background - #DCDCDC - @color/briar_red - @color/briar_white - @color/m_grey_300 + @color/briar_gray_200 + @color/briar_red_500 + @android:color/white + @color/briar_gray_200 #99000000 #dd000000 - @color/briar_white - @color/briar_blue_elio_light - @color/briar_blue_grey - @color/briar_blue_elio - #cbcbcb - #333333 + @android:color/white + @color/briar_blue_400 + @color/briar_night_50 + @color/briar_blue_600 + @color/briar_gray_300 + @color/briar_gray_900 @color/msg_stroke_light #66000000 + @android:color/white @color/briar_accent - @color/briar_blue_light + @color/briar_blue_400 #df000000 - @color/briar_white + @android:color/white #b4ffffff #80ffffff - @color/briar_blue_medium + @color/briar_night_500 @color/window_background @color/briar_accent - @color/briar_blue_light - @color/briar_blue_medium - @color/briar_red + @color/briar_blue_400 + @color/briar_night_500 + @color/briar_red_500 #28000000 - @color/m_grey_500 + @color/briar_gray_500 @color/window_background - @color/briar_white + @android:color/white - #c1c1c1 + @color/briar_gray_200 \ No newline at end of file diff --git a/briar-android/src/main/res/values/styles.xml b/briar-android/src/main/res/values/styles.xml index 6599a44ef..d5509d012 100644 --- a/briar-android/src/main/res/values/styles.xml +++ b/briar-android/src/main/res/values/styles.xml @@ -130,7 +130,7 @@ 28dp @drawable/bubble_accent center - @color/briar_white + @android:color/white 18sp