Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 03:09:04 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Use colours from style guide

See merge request briar/briar!1257
This commit is contained in:
akwizgran
2020-06-29 17:09:41 +00:00
parent e1d1c62708 428f06abdd
commit 1dd15567de
32 changed files with 114 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java
View File

@@ -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);
}

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

@@ -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);
}

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

@@ -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:

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

@@ -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(),

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

@@ -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)

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

@@ -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;
}

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

@@ -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);
}