Hack compound drawable tint for API < 23

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactAliasInputFragment.java

@@ -1,7 +1,9 @@
 package org.briarproject.briar.android.contact;
 
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -21,6 +23,8 @@ import javax.annotation.Nullable;
 
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static android.os.Build.VERSION.SDK_INT;
+import static org.briarproject.briar.android.util.UiUtils.resolveColorAttribute;
 
 @NotNullByDefault
 public class ContactAliasInputFragment extends BaseFragment

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactLinkInputFragment.java

@@ -2,6 +2,7 @@ package org.briarproject.briar.android.contact;
 
 import android.content.ClipboardManager;
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
@@ -21,7 +22,11 @@ import javax.annotation.Nullable;
 
 import static android.content.ClipDescription.MIMETYPE_TEXT_PLAIN;
 import static android.content.Context.CLIPBOARD_SERVICE;
+import static android.os.Build.VERSION.SDK_INT;
+import static android.support.v4.graphics.drawable.DrawableCompat.setTint;
+import static android.support.v4.graphics.drawable.DrawableCompat.wrap;
 import static java.util.Objects.requireNonNull;
+import static org.briarproject.briar.android.util.UiUtils.resolveColorAttribute;
 
 @NotNullByDefault
 public class ContactLinkInputFragment extends BaseFragment
@@ -55,8 +60,15 @@ public class ContactLinkInputFragment extends BaseFragment
 		clipboard = (ClipboardManager) requireNonNull(
 				getContext().getSystemService(CLIPBOARD_SERVICE));
 
+		int color = resolveColorAttribute(getContext(), R.attr.colorControlNormal);
+
 		linkInput = v.findViewById(R.id.linkInput);
 		linkInput.addTextChangedListener(this);
+		if (SDK_INT < 23) {
+			Drawable drawable = wrap(linkInput.getCompoundDrawables()[0]);
+			setTint(drawable, color);
+			linkInput.setCompoundDrawables(drawable, null, null, null);
+		}
 
 		pasteButton = v.findViewById(R.id.pasteButton);
 		pasteButton.setOnClickListener(view -> linkInput
@@ -64,6 +76,12 @@ public class ContactLinkInputFragment extends BaseFragment
 
 		contactNameInput = v.findViewById(R.id.contactNameInput);
 		contactNameInput.addTextChangedListener(this);
+		if (SDK_INT < 23) {
+			Drawable drawable =
+					wrap(contactNameInput.getCompoundDrawables()[0]);
+			setTint(drawable, color);
+			contactNameInput.setCompoundDrawables(drawable, null, null, null);
+		}
 
 		addButton = v.findViewById(R.id.addButton);
 		addButton.setOnClickListener(view -> onAddButtonClicked());

briar-android/src/main/res/drawable/ic_content_copy.xml

@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
+        android:width="24dp"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+        android:height="24dp"
-    <path android:fillColor="#FF000000" android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
+        android:tint="#2A93C6"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+	<path
+		android:fillColor="#FF000000"
+		android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
 </vector>

briar-android/src/main/res/drawable/ic_content_paste.xml

@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
+        android:width="24dp"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+        android:height="24dp"
-    <path android:fillColor="#FF000000" android:pathData="M19,2h-4.18C14.4,0.84 13.3,0 12,0c-1.3,0 -2.4,0.84 -2.82,2L5,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM12,2c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM19,20L5,20L5,4h2v3h10L17,4h2v16z"/>
+        android:tint="#2A93C6"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+	<path
+		android:fillColor="#FF000000"
+		android:pathData="M19,2h-4.18C14.4,0.84 13.3,0 12,0c-1.3,0 -2.4,0.84 -2.82,2L5,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM12,2c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM19,20L5,20L5,4h2v3h10L17,4h2v16z"/>
 </vector>

briar-android/src/main/res/drawable/ic_qr_code.xml

@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
+        android:tint="#2A93C6"
         android:viewportHeight="24"
         android:viewportWidth="24">
 	<path

briar-android/src/main/res/drawable/social_share_blue.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:tint="#2A93C6"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+	<path
+		android:fillColor="#FFFFFFFF"
+		android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>

briar-android/src/main/res/layout/fragment_contact_link_input.xml

@@ -21,7 +21,8 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		app:layout_constraintVertical_chainStyle="packed"/>
+		app:layout_constraintVertical_chainStyle="packed"
+		android:drawableStart="@drawable/ic_person"/>
 
 	<EditText
 		android:id="@+id/linkInput"
@@ -52,7 +53,6 @@
 		android:layout_marginTop="8dp"
 		android:drawableLeft="@drawable/ic_content_paste"
 		android:drawablePadding="8dp"
-		android:drawableTint="@color/briar_text_link"
 		android:text="@string/paste_button"
 		app:layout_constraintEnd_toStartOf="@+id/scanCodeButton"
 		app:layout_constraintHorizontal_bias="0.5"
@@ -71,7 +71,6 @@
 		android:layout_marginTop="8dp"
 		android:drawableLeft="@drawable/ic_qr_code"
 		android:drawablePadding="8dp"
-		android:drawableTint="@color/briar_button_text_positive"
 		android:text="Scan Code"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintHorizontal_bias="0.5"

briar-android/src/main/res/layout/fragment_contact_link_output.xml

@@ -25,6 +25,8 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginEnd="@dimen/margin_large"
+		android:layout_marginLeft="@dimen/margin_large"
+		android:layout_marginRight="@dimen/margin_large"
 		android:layout_marginStart="@dimen/margin_large"
 		android:background="@color/briar_white"
 		android:padding="8dp"
@@ -38,7 +40,7 @@
 		app:layout_constraintTop_toBottomOf="@id/linkIntro"
 		tools:text="briar://scnsdflamslkfjgluoblmksdfbwevlewajfdlkjewwhqliafskfjhskdjhvoieiv"/>
 
-	<Button
+	<android.support.v7.widget.AppCompatButton
 		android:id="@+id/copyButton"
 		style="@style/BriarButtonFlat.Positive"
 		android:layout_width="wrap_content"
@@ -46,7 +48,6 @@
 		android:layout_marginTop="@dimen/margin_large"
 		android:drawableLeft="@drawable/ic_content_copy"
 		android:drawablePadding="8dp"
-		android:drawableTint="@color/briar_button_text_positive"
 		android:text="@string/copy_button"
 		app:layout_constraintEnd_toStartOf="@+id/shareButton"
 		app:layout_constraintHorizontal_bias="0.5"
@@ -59,9 +60,8 @@
 		style="@style/BriarButtonFlat.Positive"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:drawableLeft="@drawable/social_share_white"
+		android:drawableLeft="@drawable/social_share_blue"
 		android:drawablePadding="8dp"
-		android:drawableTint="@color/briar_button_text_positive"
 		android:text="@string/share_button"
 		app:layout_constraintBottom_toBottomOf="@id/copyButton"
 		app:layout_constraintEnd_toStartOf="@+id/showCodeButton"