Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Use colours from style guide.

Browse Source
This commit is contained in:
akwizgran
2020-06-29 15:43:37 +01:00
parent 443043ae09
commit ae75090d23
16 changed files with 86 additions and 79 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);
}

2
briar-android/src/main/res/drawable/bubble_completed.xml
View File

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

5
briar-android/src/main/res/layout/activity_image.xml
View File

@@ -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"
tools:background="@color/briar_green_light" />
android:layout_height="match_parent" />
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"

2
briar-android/src/main/res/layout/fragment_link_dialog.xml
View File

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

6
briar-android/src/main/res/layout/fragment_link_exchange.xml
View File

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

2
briar-android/src/main/res/layout/fragment_nickname.xml
View File

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

2
briar-android/src/main/res/layout/list_item_pending_contact.xml
View File

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

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

@@ -1,29 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="briar_primary">@color/briar_blue_dark</color>
<color name="briar_accent">@color/briar_green</color>
<color name="briar_primary">@color/briar_night_800</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_out">@color/briar_blue_elio_light</color>
<color name="notice_in">@color/briar_blue_dark</color>
<color name="notice_out">@color/briar_blue_elio</color>
<color name="msg_in">@color/briar_night_700</color>
<color name="msg_out">@color/briar_blue_600</color>
<color name="notice_in">@color/briar_night_800</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="card_background">@color/briar_blue_dark</color>
<color name="item_background_highlight">@color/briar_blue</color>
<color name="window_background">@color/briar_night_950</color>
<color name="card_background">@color/briar_night_800</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_text_neutral">@color/briar_blue_light</color>
<color name="briar_button_background_color">@color/briar_night_500</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_item_highlight">@color/briar_black</color>
<color name="thread_indicator">@color/briar_night_700</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>

89
briar-android/src/main/res/values/color.xml
View File

@@ -1,68 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="briar_blue">#2D3E50</color>
<color name="briar_blue_dark">#222E3C</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="briar_lime_600">#67a60f</color>
<color name="briar_lime_400">#82c91e</color>
<color name="m_grey_300">#e0e0e0</color>
<color name="m_grey_500">#9e9e9e</color>
<color name="m_blue_grey_50">#eceff1</color>
<color name="briar_blue_800">#134a81</color>
<color name="briar_blue_600">#1b69b6</color>
<color name="briar_blue_400">#418cd8</color>
<color name="briar_primary">@color/briar_blue</color>
<color name="briar_primary_dark">@color/briar_blue_very_dark</color>
<color name="briar_accent">@color/briar_blue</color>
<color name="briar_orange_500">#fc9403</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="briar_warning_background">@color/briar_red</color>
<color name="action_bar_text">@color/briar_white</color>
<color name="private_message_date_inverse">@color/m_grey_300</color>
<color name="item_background_highlight">@color/briar_gray_200</color>
<color name="briar_warning_background">@color/briar_red_500</color>
<color name="action_bar_text">@android:color/white</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_out">@color/briar_blue_elio_light</color>
<color name="notice_in">@color/briar_blue_grey</color>
<color name="notice_out">@color/briar_blue_elio</color>
<color name="msg_stroke_light">#cbcbcb</color>
<color name="msg_stroke_dark">#333333</color>
<color name="msg_in">@android:color/white</color>
<color name="msg_out">@color/briar_blue_400</color>
<color name="notice_in">@color/briar_night_50</color>
<color name="notice_out">@color/briar_blue_600</color>
<color name="msg_stroke_light">@color/briar_gray_300</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_neutral">@color/briar_blue_medium</color>
<color name="briar_button_text_negative">@color/briar_red</color>
<color name="briar_button_text_positive">@color/briar_blue_400</color>
<color name="briar_button_text_neutral">@color/briar_night_500</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>

2
briar-android/src/main/res/values/styles.xml
View File

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