aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2015-12-04 16:35:40 +0100
committersteckbrief <steckbrief@chefmail.de>2015-12-04 16:35:40 +0100
commitca0d68224ec804cac739ed955390aa7f6a585856 (patch)
treee0e8cb976fbac953e49be6f391b053502d5a9fc6
parent274a689dce6b903674cc738159bb112dcad17800 (diff)
parent96e6604d9eed10d08534ddb6c7a33b7ec9dfc68e (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java9
-rw-r--r--src/main/java/eu/siacs/conversations/services/NotificationService.java2
-rw-r--r--src/main/java/eu/siacs/conversations/ui/XmppActivity.java14
-rw-r--r--src/main/res/layout/account_row.xml4
-rw-r--r--src/main/res/layout/activity_about.xml2
-rw-r--r--src/main/res/layout/activity_change_password.xml18
-rw-r--r--src/main/res/layout/activity_contact_details.xml10
-rw-r--r--src/main/res/layout/activity_edit_account.xml60
-rw-r--r--src/main/res/layout/activity_muc_details.xml10
-rw-r--r--src/main/res/layout/activity_publish_profile_picture.xml12
-rw-r--r--src/main/res/layout/activity_verify_otr.xml20
-rw-r--r--src/main/res/layout/contact.xml6
-rw-r--r--src/main/res/layout/contact_key.xml4
-rw-r--r--src/main/res/layout/conversation_list_row.xml8
-rw-r--r--src/main/res/layout/create_contact_dialog.xml8
-rw-r--r--src/main/res/layout/dialog_message_details.xml2
-rw-r--r--src/main/res/layout/fragment_conversation.xml2
-rw-r--r--src/main/res/layout/join_conference_dialog.xml8
-rw-r--r--src/main/res/layout/message_received.xml6
-rw-r--r--src/main/res/layout/message_sent.xml6
-rw-r--r--src/main/res/layout/message_status.xml2
-rw-r--r--src/main/res/layout/quickedit.xml2
-rw-r--r--src/main/res/values/colors.xml33
23 files changed, 124 insertions, 124 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
index c72d833f..7d82223c 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
@@ -73,34 +73,29 @@ public class MessageDetailsDialog extends AbstractAlertDialog {
protected void displayMessageStatusInfo(View view, Message message) {
TextView msgStatusTextView = (TextView) view.findViewById(R.id.dlgMsgDetMsgStatus);
int msgStatusResId;
- int msgStatusColorResId;
+ int msgStatusColorResId = R.color.primaryText;
switch (message.getStatus()) {
case Message.STATUS_WAITING:
msgStatusResId = R.string.dlg_msg_details_msg_status_waiting;
- msgStatusColorResId = R.color.black87;
break;
case Message.STATUS_UNSEND:
msgStatusResId = R.string.dlg_msg_details_msg_status_unsend;
- msgStatusColorResId = R.color.black87;
break;
case Message.STATUS_OFFERED:
msgStatusResId = R.string.dlg_msg_details_msg_status_offered;
- msgStatusColorResId = R.color.black87;
break;
case Message.STATUS_SEND_FAILED:
msgStatusResId = R.string.dlg_msg_details_msg_status_failed;
- msgStatusColorResId = R.color.red500;
+ msgStatusColorResId = R.color.error;
break;
case Message.STATUS_RECEIVED:
msgStatusResId = R.string.dlg_msg_details_msg_status_received;
- msgStatusColorResId = R.color.black87;
break;
case Message.STATUS_SEND:
case Message.STATUS_SEND_DISPLAYED:
case Message.STATUS_SEND_RECEIVED:
default:
msgStatusResId = R.string.dlg_msg_details_msg_status_sent;
- msgStatusColorResId = R.color.black87;
}
msgStatusTextView.setText(msgStatusResId);
msgStatusTextView.setTextColor(getContext().getResources().getColor(msgStatusColorResId));
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index aecefbf0..2bc0ca16 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -171,7 +171,7 @@ public class NotificationService {
}
private void setNotificationColor(final Builder mBuilder) {
- mBuilder.setColor(mXmppConnectionService.getResources().getColor(R.color.green500));
+ mBuilder.setColor(mXmppConnectionService.getResources().getColor(R.color.notification));
}
private void updateNotification(final boolean notify) {
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 57166fe6..2acce0f8 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -334,14 +334,12 @@ public abstract class XmppActivity extends Activity {
super.onCreate(savedInstanceState);
metrics = getResources().getDisplayMetrics();
ExceptionHelper.init(getApplicationContext());
- mPrimaryTextColor = getResources().getColor(R.color.black87);
- mSecondaryTextColor = getResources().getColor(R.color.black54);
- mColorRed = getResources().getColor(R.color.red500);
- mColorOrange = getResources().getColor(R.color.orange500);
- mColorGreen = getResources().getColor(R.color.green500);
- mPrimaryColor = getResources().getColor(R.color.green500);
- mPrimaryBackgroundColor = getResources().getColor(R.color.grey50);
- mSecondaryBackgroundColor = getResources().getColor(R.color.grey200);
+ mPrimaryTextColor = getResources().getColor(R.color.primaryText);
+ mSecondaryTextColor = getResources().getColor(R.color.secondaryText);
+ mColorRed = getResources().getColor(R.color.warning);
+ mColorGreen = getResources().getColor(R.color.online);
+ mPrimaryBackgroundColor = getResources().getColor(R.color.primaryBackground);
+ mSecondaryBackgroundColor = getResources().getColor(R.color.secondaryBackground);
this.mTheme = findTheme();
setTheme(this.mTheme);
this.mUsingEnterKey = ConversationsPlusPreferences.displayEnterKey();
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 06716a10..77138a4a 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -32,7 +32,7 @@
android:layout_height="wrap_content"
android:scrollHorizontally="false"
android:singleLine="true"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeHeadline" />
<TextView
@@ -40,7 +40,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_status_unknown"
- android:textColor="@color/black54"
+ android:textColor="@color/secondaryText"
android:textSize="?attr/TextSizeBody"
android:textStyle="bold" />
</LinearLayout>
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index d7d23f0f..310246b9 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -15,7 +15,7 @@
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
android:typeface="monospace"/>
</ScrollView>
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index 1a4d00d8..df75e61f 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -22,7 +22,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/current_password"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"/>
<EditText
@@ -32,15 +32,15 @@
android:layout_marginBottom="8dp"
android:hint="@string/password"
android:inputType="textPassword"
- android:textColor="@color/black87"
- android:textColorHint="@color/black54"
+ android:textColor="@color/primaryText"
+ android:textColorHint="@color/secondaryText"
android:textSize="?attr/TextSizeBody"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/new_password"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"/>
<EditText
@@ -50,15 +50,15 @@
android:layout_marginBottom="8dp"
android:hint="@string/password"
android:inputType="textPassword"
- android:textColor="@color/black87"
- android:textColorHint="@color/black54"
+ android:textColor="@color/primaryText"
+ android:textColorHint="@color/secondaryText"
android:textSize="?attr/TextSizeBody"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_settings_confirm_password"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"/>
<EditText
@@ -67,8 +67,8 @@
android:layout_height="wrap_content"
android:hint="@string/password"
android:inputType="textPassword"
- android:textColor="@color/black87"
- android:textColorHint="@color/black54"
+ android:textColor="@color/primaryText"
+ android:textColorHint="@color/secondaryText"
android:textSize="?attr/TextSizeBody"/>
</LinearLayout>
</ScrollView>
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 5f6a2dd0..598003e3 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -39,7 +39,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_settings_example_jabber_id"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold" />
@@ -61,7 +61,7 @@
android:id="@+id/details_lastseen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/black54"
+ android:textColor="@color/secondaryText"
android:textSize="?attr/TextSizeBody" />
</LinearLayout>
@@ -78,7 +78,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/send_presence_updates"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
<CheckBox
@@ -86,7 +86,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/receive_presence_updates"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
</LinearLayout>
@@ -98,7 +98,7 @@
android:layout_below="@+id/details_jidbox"
android:layout_marginTop="32dp"
android:text="@string/using_account"
- android:textColor="@color/black54"
+ android:textColor="@color/secondaryText"
android:textSize="?attr/TextSizeInfo" />
</RelativeLayout>
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 98de84f5..9c951afd 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -42,7 +42,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_settings_jabber_id"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
<AutoCompleteTextView
@@ -51,8 +51,8 @@
android:layout_height="wrap_content"
android:hint="@string/account_settings_example_jabber_id"
android:inputType="textEmailAddress"
- android:textColor="@color/black87"
- android:textColorHint="@color/black54"
+ android:textColor="@color/primaryText"
+ android:textColorHint="@color/secondaryText"
android:textSize="?attr/TextSizeBody" />
<TextView
@@ -60,7 +60,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/account_settings_password"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
<EditText
@@ -69,8 +69,8 @@
android:layout_height="wrap_content"
android:hint="@string/password"
android:inputType="textPassword"
- android:textColor="@color/black87"
- android:textColorHint="@color/black54"
+ android:textColor="@color/primaryText"
+ android:textColorHint="@color/secondaryText"
android:textSize="?attr/TextSizeBody" />
<CheckBox
@@ -79,7 +79,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/register_account"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
<TextView
@@ -87,7 +87,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_settings_confirm_password"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
android:visibility="gone" />
@@ -99,8 +99,8 @@
android:hint="@string/confirm_password"
android:inputType="textPassword"
android:visibility="gone"
- android:textColor="@color/black87"
- android:textColorHint="@color/black54"
+ android:textColor="@color/primaryText"
+ android:textColorHint="@color/secondaryText"
android:textSize="?attr/TextSizeBody" />
</LinearLayout>
</RelativeLayout>
@@ -132,7 +132,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/server_info_session_established"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
<TextView
@@ -140,7 +140,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
tools:ignore="RtlHardcoded"/>
</TableRow>
@@ -161,7 +161,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/server_info_pep"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
<TextView
@@ -169,7 +169,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
tools:ignore="RtlHardcoded"/>
</TableRow>
@@ -182,7 +182,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/server_info_blocking"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
<TextView
@@ -190,7 +190,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
tools:ignore="RtlHardcoded"/>
</TableRow>
@@ -203,7 +203,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/server_info_stream_management"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
<TextView
@@ -211,7 +211,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
tools:ignore="RtlHardcoded"/>
</TableRow>
@@ -224,7 +224,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/server_info_roster_version"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
<TextView
@@ -232,7 +232,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
tools:ignore="RtlHardcoded"/>
</TableRow>
@@ -245,7 +245,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/server_info_carbon_messages"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
<TextView
@@ -253,7 +253,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
tools:ignore="RtlHardcoded"/>
</TableRow>
@@ -266,7 +266,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/server_info_mam"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
<TextView
@@ -274,7 +274,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
tools:ignore="RtlHardcoded"/>
</TableRow>
@@ -287,7 +287,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/server_info_csi"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
<TextView
@@ -295,7 +295,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
tools:ignore="RtlHardcoded"/>
</TableRow>
@@ -318,14 +318,14 @@
android:id="@+id/otr_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
android:typeface="monospace" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/black54"
+ android:textColor="@color/secondaryText"
android:textSize="?attr/TextSizeInfo"
android:text="@string/otr_fingerprint"/>
</LinearLayout>
@@ -363,7 +363,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/cancel"
- android:textColor="@color/black87" />
+ android:textColor="@color/primaryText" />
<View
android:layout_width="1dp"
@@ -380,7 +380,7 @@
android:layout_weight="1"
android:enabled="false"
android:text="@string/save"
- android:textColor="@color/black54" />
+ android:textColor="@color/secondaryText" />
</LinearLayout>
</RelativeLayout>
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index b89c9945..a35e3301 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="@string/account_settings_example_jabber_id"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold"/>
@@ -56,7 +56,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeHeadline"/>
<TextView
@@ -64,7 +64,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"/>
</LinearLayout>
@@ -88,7 +88,7 @@
android:layout_height="wrap_content"
android:text="@string/private_conference"
android:layout_centerVertical="true"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/change_conference_button"
@@ -113,7 +113,7 @@
android:layout_gravity="right"
android:layout_marginTop="32dp"
android:text="@string/using_account"
- android:textColor="@color/black54"
+ android:textColor="@color/secondaryText"
android:textSize="?attr/TextSizeInfo"/>
</LinearLayout>
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 4b249745..45f979e3 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -27,7 +27,7 @@
android:layout_below="@id/account_image_wrapper"
android:layout_centerHorizontal="true"
android:text="@string/touch_to_choose_picture"
- android:textColor="@color/black54" />
+ android:textColor="@color/secondaryText" />
<TextView
android:id="@+id/secondary_hint"
@@ -36,7 +36,7 @@
android:layout_below="@id/hint"
android:layout_centerHorizontal="true"
android:text="@string/or_long_press_for_default"
- android:textColor="@color/black54" />
+ android:textColor="@color/secondaryText" />
<LinearLayout
android:id="@+id/button_bar"
@@ -53,7 +53,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/cancel"
- android:textColor="@color/black87" />
+ android:textColor="@color/primaryText" />
<View
android:layout_width="1dp"
@@ -70,7 +70,7 @@
android:layout_weight="1"
android:enabled="false"
android:text="@string/publish"
- android:textColor="@color/black54" />
+ android:textColor="@color/secondaryText" />
</LinearLayout>
<LinearLayout
@@ -89,7 +89,7 @@
android:id="@+id/account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeHeadline" />
<TextView
@@ -99,7 +99,7 @@
android:layout_marginTop="8dp"
android:minLines="3"
android:text="@string/publish_avatar_explanation"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
</LinearLayout>
diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml
index ab21c693..ce8b831e 100644
--- a/src/main/res/layout/activity_verify_otr.xml
+++ b/src/main/res/layout/activity_verify_otr.xml
@@ -34,7 +34,7 @@
android:id="@+id/your_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
android:typeface="monospace"/>
@@ -42,7 +42,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/your_fingerprint"
- android:textColor="@color/black54"
+ android:textColor="@color/secondaryText"
android:textSize="?attr/TextSizeInfo"/>
<TextView
@@ -50,7 +50,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
android:typeface="monospace"/>
@@ -59,7 +59,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:text="@string/remote_fingerprint"
- android:textColor="@color/black54"
+ android:textColor="@color/secondaryText"
android:textSize="?attr/TextSizeInfo"/>
</LinearLayout>
@@ -77,7 +77,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/verified"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold"
android:visibility="gone"/>
@@ -87,7 +87,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
android:textStyle="bold"
android:visibility="gone"/>
@@ -99,8 +99,8 @@
android:layout_marginBottom="8dp"
android:hint="@string/shared_secret_hint"
android:inputType="textAutoComplete"
- android:textColor="@color/black87"
- android:textColorHint="@color/black54"
+ android:textColor="@color/primaryText"
+ android:textColorHint="@color/secondaryText"
android:textSize="?attr/TextSizeBody"/>
<EditText
@@ -110,8 +110,8 @@
android:layout_marginTop="8dp"
android:hint="@string/shared_secret_secret"
android:inputType="textPassword"
- android:textColor="@color/black87"
- android:textColorHint="@color/black54"
+ android:textColor="@color/primaryText"
+ android:textColorHint="@color/secondaryText"
android:textSize="?attr/TextSizeBody"/>
</LinearLayout>
</LinearLayout>
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 8a8e311b..853387f3 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -34,7 +34,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeHeadline" />
<TextView
@@ -42,7 +42,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
<LinearLayout
android:id="@+id/tags"
@@ -55,7 +55,7 @@
android:id="@+id/key"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeHeadline"
android:typeface="monospace"
android:visibility="gone" />
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 933b72b4..22e4e576 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -15,7 +15,7 @@
android:id="@+id/key"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
android:typeface="monospace" />
@@ -23,7 +23,7 @@
android:id="@+id/key_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/black54"
+ android:textColor="@color/secondaryText"
android:textSize="?attr/TextSizeInfo"/>
</LinearLayout>
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index e240fa85..4ac7440c 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -58,7 +58,7 @@
android:layout_alignLeft="@+id/conversation_lastwrapper"
android:layout_toLeftOf="@+id/conversation_lastupdate"
android:singleLine="true"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeHeadline"
android:typeface="sans" />
@@ -76,7 +76,7 @@
android:layout_height="wrap_content"
android:scrollHorizontally="false"
android:singleLine="true"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
emojicon:emojiconSize="20sp" />
@@ -84,7 +84,7 @@
android:id="@+id/conversation_lastimage"
android:layout_width="fill_parent"
android:layout_height="36dp"
- android:background="@color/black87"
+ android:background="@color/primaryText"
android:scaleType="centerCrop" />
</LinearLayout>
@@ -95,7 +95,7 @@
android:layout_alignBaseline="@+id/conversation_name"
android:layout_alignParentRight="true"
android:gravity="right"
- android:textColor="@color/black54"
+ android:textColor="@color/secondaryText"
android:textSize="?attr/TextSizeInfo" />
</RelativeLayout>
</RelativeLayout>
diff --git a/src/main/res/layout/create_contact_dialog.xml b/src/main/res/layout/create_contact_dialog.xml
index 6333e340..d4fba603 100644
--- a/src/main/res/layout/create_contact_dialog.xml
+++ b/src/main/res/layout/create_contact_dialog.xml
@@ -10,7 +10,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/your_account"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
<Spinner
@@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/account_settings_jabber_id"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
<AutoCompleteTextView
@@ -33,7 +33,7 @@
android:layout_height="wrap_content"
android:hint="@string/account_settings_example_jabber_id"
android:inputType="textEmailAddress"
- android:textColor="@color/black87"
- android:textColorHint="@color/black54" />
+ android:textColor="@color/primaryText"
+ android:textColorHint="@color/secondaryText" />
</LinearLayout> \ No newline at end of file
diff --git a/src/main/res/layout/dialog_message_details.xml b/src/main/res/layout/dialog_message_details.xml
index 4d63831e..84159f44 100644
--- a/src/main/res/layout/dialog_message_details.xml
+++ b/src/main/res/layout/dialog_message_details.xml
@@ -98,7 +98,7 @@
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:stretchColumns="1"
- android:background="@color/black87"
+ android:background="@color/primaryText"
android:id="@+id/dlgMsgDetFileTable"
android:visibility="gone">
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 321055e9..4776f3b8 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -53,7 +53,7 @@
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="12dp"
- android:textColor="@color/black87" >
+ android:textColor="@color/primaryText" >
<requestFocus />
</eu.siacs.conversations.ui.EditMessage>
diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml
index 7609dd0d..ef113017 100644
--- a/src/main/res/layout/join_conference_dialog.xml
+++ b/src/main/res/layout/join_conference_dialog.xml
@@ -10,7 +10,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/your_account"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
<Spinner
@@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/conference_address"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody" />
<AutoCompleteTextView
@@ -33,8 +33,8 @@
android:layout_height="wrap_content"
android:hint="@string/conference_address_example"
android:inputType="textEmailAddress"
- android:textColor="@color/black87"
- android:textColorHint="@color/black54" />
+ android:textColor="@color/primaryText"
+ android:textColorHint="@color/secondaryText" />
<CheckBox
android:id="@+id/bookmark"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 82f85176..f16f551a 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -36,7 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
- android:background="@color/black87"
+ android:background="@color/primaryText"
android:paddingBottom="2dp"
android:scaleType="centerCrop" />
@@ -45,7 +45,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web|phone|email"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
emojicon:emojiconSize="28sp" />
@@ -79,7 +79,7 @@
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:text="@string/sending"
- android:textColor="@color/black54"
+ android:textColor="@color/secondaryText"
android:textSize="?attr/TextSizeInfo" />
</LinearLayout>
</LinearLayout>
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 3b8212a5..00368194 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -36,7 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
- android:background="@color/black87"
+ android:background="@color/primaryText"
android:paddingBottom="2dp"
android:scaleType="centerCrop" />
@@ -45,7 +45,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web|phone|email"
- android:textColor="@color/black87"
+ android:textColor="@color/primaryText"
android:textSize="?attr/TextSizeBody"
emojicon:emojiconSize="28sp" />
@@ -70,7 +70,7 @@
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:text="@string/sending"
- android:textColor="@color/black54"
+ android:textColor="@color/secondaryText"
android:textSize="?attr/TextSizeInfo" />
<ImageView
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index 2816f475..412fbde0 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -28,7 +28,7 @@
android:layout_toEndOf="@+id/message_photo"
android:layout_toRightOf="@+id/message_photo"
android:text="@string/contact_has_read_up_to_this_point"
- android:textColor="@color/black54"
+ android:textColor="@color/secondaryText"
android:textSize="?attr/TextSizeInfo"
android:textStyle="italic"/>
diff --git a/src/main/res/layout/quickedit.xml b/src/main/res/layout/quickedit.xml
index ff6b0413..74e8dcf8 100644
--- a/src/main/res/layout/quickedit.xml
+++ b/src/main/res/layout/quickedit.xml
@@ -11,7 +11,7 @@
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textPersonName"
- android:textColor="@color/black87" >
+ android:textColor="@color/primaryText" >
<requestFocus />
</EditText>
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 2c3b9f78..9cef1b0a 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -2,17 +2,24 @@
<resources>
<color name="primaryBackground">@color/grey50</color>
<color name="secondaryBackground">@color/grey200</color>
- <color name="green500">#ff259b24</color>
- <color name="green700">#ff0a7e07</color>
- <color name="accent">#ff0091ea</color>
- <color name="black87">#de000000</color>
- <color name="black54">#8a000000</color>
- <color name="black12">#1f000000</color>
- <color name="white">#ffffffff</color>
- <color name="white70">#b2ffffff</color>
- <color name="grey50">#fffafafa</color>
- <color name="grey200">#ffeeeeee</color>
- <color name="grey800">#ff424242</color>
- <color name="red500">#fff44336</color>
- <color name="orange500">#ffff9800</color>
+ <color name="primaryText">@color/black87</color>
+ <color name="secondaryText">@color/black54</color>
+ <color name="warning">@color/red500</color>
+ <color name="error">@color/red500</color>
+ <color name="online">@color/green500</color>
+ <color name="notification">@color/green500</color>
+
+ <color name="green500">#ff259b24</color>
+ <color name="green700">#ff0a7e07</color>
+ <color name="accent">#ff0091ea</color>
+ <color name="black87">#de000000</color>
+ <color name="black54">#8a000000</color>
+ <color name="black12">#1f000000</color>
+ <color name="white">#ffffffff</color>
+ <color name="white70">#b2ffffff</color>
+ <color name="grey50">#fffafafa</color>
+ <color name="grey200">#ffeeeeee</color>
+ <color name="grey800">#ff424242</color>
+ <color name="red500">#fff44336</color>
+ <color name="orange500">#ffff9800</color>
</resources> \ No newline at end of file