theming: switched to material green. changed accent color

art/message_bubble_received.svg

@@ -140,7 +140,7 @@
      transform="translate(0,-2)">
     <g
        id="g3759"
-       style="fill:#4b9b4a;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
+       style="fill:#4d8e50;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
       <path
          style="display:none"
          d="m 8,6 c 2,2 4,6 4,10 L 16,6 z"

art/message_bubble_received_dark.svg

@@ -140,7 +140,7 @@
      transform="translate(0,-2)">
     <g
        id="g3759"
-       style="fill:#326130;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
+       style="fill:#295e2d;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
       <path
          style="display:none"
          d="m 8,6 c 2,2 4,6 4,10 L 16,6 z"

src/main/java/eu/siacs/conversations/services/NotificationService.java

@@ -249,7 +249,7 @@ public class NotificationService {
 	}
 
 	private void setNotificationColor(final Builder mBuilder) {
-		mBuilder.setColor(ContextCompat.getColor(mXmppConnectionService, R.color.primary500));
+		mBuilder.setColor(ContextCompat.getColor(mXmppConnectionService, R.color.green600));
 	}
 
 	public void updateNotification(final boolean notify) {

src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java

@@ -438,7 +438,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
 			TextView keyType = (TextView) view.findViewById(R.id.key_type);
 			keyType.setText(R.string.openpgp_key_id);
 			if ("pgp".equals(messageFingerprint)) {
-				keyType.setTextColor(ContextCompat.getColor(this, R.color.accent));
+				keyType.setTextAppearance(this, R.style.TextAppearance_Conversations_Caption_Highlight);
 			}
 			key.setText(OpenPgpUtils.convertKeyIdToHex(contact.getPgpKeyId()));
 			final OnClickListener openKey = v -> launchOpenKeyChain(contact.getPgpKeyId());

src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java

@@ -405,7 +405,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
 			body.setSpan(new DividerSpan(false), end, end + 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 		}
 		int color = darkBackground ? this.getMessageTextColor(darkBackground, false)
-				: ContextCompat.getColor(activity, R.color.bubble);
+				: ContextCompat.getColor(activity, R.color.green700_desaturated);
 		DisplayMetrics metrics = getContext().getResources().getDisplayMetrics();
 		body.setSpan(new QuoteSpan(color, metrics), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 		return 0;

src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java

@@ -1,7 +1,6 @@
 package eu.siacs.conversations.ui.forms;
 
 import android.content.Context;
-import android.support.v4.content.ContextCompat;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
@@ -11,6 +10,7 @@ import android.view.View;
 import java.util.List;
 
 import eu.siacs.conversations.R;
+import eu.siacs.conversations.ui.util.Color;
 import eu.siacs.conversations.xmpp.forms.Field;
 
 public abstract class FormFieldWrapper {
@@ -58,7 +58,7 @@ public abstract class FormFieldWrapper {
 			int start = label.length();
 			int end = label.length() + 2;
 			spannableString.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), start, end, 0);
-			spannableString.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, R.color.accent)), start, end, 0);
+			spannableString.setSpan(new ForegroundColorSpan(Color.get(context,R.attr.colorAccent)), start, end, 0);
 		}
 		return spannableString;
 	}

src/main/java/eu/siacs/conversations/ui/service/AudioPlayer.java

@@ -70,7 +70,7 @@ public class AudioPlayer implements View.OnClickListener, MediaPlayer.OnCompleti
 		}
 		viewHolder.progress.setOnSeekBarChangeListener(this);
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-			ColorStateList color = ContextCompat.getColorStateList(messageAdapter.getContext(), viewHolder.darkBackground ? R.color.white70 : R.color.bubble);
+			ColorStateList color = ContextCompat.getColorStateList(messageAdapter.getContext(), viewHolder.darkBackground ? R.color.white70 : R.color.green700_desaturated);
 			viewHolder.progress.setThumbTintList(color);
 			viewHolder.progress.setProgressTintList(color);
 		}

src/main/java/eu/siacs/conversations/ui/util/DateSeparator.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2018, Daniel Gultsch All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package eu.siacs.conversations.ui.util;
+
+import java.util.List;
+
+import eu.siacs.conversations.entities.IndividualMessage;
+import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.utils.UIHelper;
+
+public class DateSeparator {
+
+	public static void addAll(List<Message> messages) {
+		for (int i = 0; i < messages.size(); ++i) {
+			final Message current = messages.get(i);
+			if (i == 0 || !UIHelper.sameDay(messages.get(i - 1).getTimeSent(), current.getTimeSent())) {
+				messages.add(i, IndividualMessage.createDateSeparator(current));
+				i++;
+			}
+		}
+	}
+}

src/main/java/eu/siacs/conversations/ui/widget/MyLocation.java

@@ -8,6 +8,7 @@ import android.graphics.Paint;
 import android.graphics.Point;
 import android.location.Location;
 import android.os.Build;
+import android.support.v4.content.ContextCompat;
 
 import org.osmdroid.util.GeoPoint;
 import org.osmdroid.views.MapView;
@@ -24,23 +25,11 @@ public class MyLocation extends SimpleLocationOverlay {
 	private final Paint fill;
 	private final Paint outline;
 
-	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
-	private int getColor(final Context ctx) {
-		final int accent;
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-			accent = ctx.getResources().getColor(R.color.accent, ctx.getTheme());
-		} else {
-			//noinspection deprecation
-			accent = ctx.getResources().getColor(R.color.accent);
-		}
-		return accent;
-	}
-
 	public MyLocation(final Context ctx, final Bitmap icon, final Location position) {
 		super(icon);
 		this.mapCenterPoint = new Point();
 		this.fill = new Paint(Paint.ANTI_ALIAS_FLAG);
-		final int accent = this.getColor(ctx);
+		final int accent = ContextCompat.getColor(ctx,R.color.blue500);
 		fill.setColor(accent);
 		fill.setStyle(Paint.Style.FILL);
 		this.outline = new Paint(Paint.ANTI_ALIAS_FLAG);

src/main/java/eu/siacs/conversations/ui/widget/UnreadCountCustomView.java

@@ -37,7 +37,7 @@ public class UnreadCountCustomView extends View {
 
     private void initXMLAttrs(Context context, AttributeSet attrs) {
         TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.UnreadCountCustomView);
-        setBackgroundColor(a.getColor(a.getIndex(0), ContextCompat.getColor(context, R.color.unreadcountlight)));
+        setBackgroundColor(a.getColor(a.getIndex(0), ContextCompat.getColor(context, R.color.green700_desaturated)));
         a.recycle();
     }