diff --git a/briar-android/artwork/notification_signout.svg b/briar-android/artwork/notification_signout.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ac9680fe87ae39694f828b5ba1fe1a974c3d791f
--- /dev/null
+++ b/briar-android/artwork/notification_signout.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M16,17V14H9V10H16V7L21,12L16,17M14,2A2,2 0 0,1 16,4V6H14V4H5V20H14V18H16V20A2,2 0 0,1 14,22H5A2,2 0 0,1 3,20V4A2,2 0 0,1 5,2H14Z" /></svg>
\ No newline at end of file
diff --git a/briar-android/build.gradle b/briar-android/build.gradle
index 95c18ca3ca4bd1217732935a49a9bb28027656fe..12f93024c887f6a19ee1aa7d2c48b33c07990bc5 100644
--- a/briar-android/build.gradle
+++ b/briar-android/build.gradle
@@ -25,6 +25,8 @@ android {
versionCode 10213
versionName "1.2.13"
applicationId "org.briarproject.briar.android"
+
+ vectorDrawables.useSupportLibrary = true
buildConfigField "String", "GitHash",
"\"${getStdout(['git', 'rev-parse', '--short=7', 'HEAD'], 'No commit hash')}\""
def now = (long) (System.currentTimeMillis() / 1000)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java
index 7bad141784867509202c76ca6cd9540e68330b37..4b007e3a0df1d84d686e2c7e04fc5a2b729bfecc 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java
@@ -255,7 +255,7 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
R.string.ongoing_notification_title;
int text = locked ? R.string.lock_tap_to_unlock :
R.string.ongoing_notification_text;
- int icon = locked ? R.drawable.startup_lock :
+ int icon = locked ? R.drawable.notification_lock :
R.drawable.notification_ongoing;
// Ongoing foreground notification that shows BriarService is running
NotificationCompat.Builder b =
@@ -624,7 +624,7 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
NotificationCompat.Builder b =
new NotificationCompat.Builder(appContext, REMINDER_CHANNEL_ID);
- b.setSmallIcon(R.drawable.ic_signout);
+ b.setSmallIcon(R.drawable.notification_signout);
b.setColor(getColor(appContext, R.color.briar_primary));
b.setContentTitle(
appContext.getText(R.string.reminder_notification_title));
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
index 9a46153f1efff7266e5bbad7476ee41e66c16f0a..01e0c16476691afdec9f4ab2551455bbd2f6b2f5 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
@@ -3,6 +3,7 @@ package org.briarproject.briar.android.conversation;
import android.annotation.SuppressLint;
import android.content.DialogInterface;
import android.content.Intent;
+import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Parcelable;
import android.transition.Slide;
@@ -105,6 +106,7 @@ import androidx.recyclerview.selection.SelectionTracker.SelectionObserver;
import androidx.recyclerview.selection.StorageStrategy;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
import de.hdodenhof.circleimageview.CircleImageView;
import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt;
@@ -479,12 +481,10 @@ public class ConversationActivity extends BriarActivity
@UiThread
private void displayContactOnlineStatus() {
if (connectionRegistry.isConnected(contactId)) {
- toolbarStatus.setImageDrawable(ContextCompat.getDrawable(
- ConversationActivity.this, R.drawable.contact_online));
+ toolbarStatus.setImageResource(R.drawable.contact_online);
toolbarStatus.setContentDescription(getString(R.string.online));
} else {
- toolbarStatus.setImageDrawable(ContextCompat.getDrawable(
- ConversationActivity.this, R.drawable.contact_offline));
+ toolbarStatus.setImageResource(R.drawable.contact_offline);
toolbarStatus.setContentDescription(getString(R.string.offline));
}
}
@@ -935,13 +935,16 @@ public class ConversationActivity extends BriarActivity
return;
}
+ int color =
+ ContextCompat.getColor(this, R.color.briar_primary);
+ Drawable drawable = VectorDrawableCompat
+ .create(getResources(), R.drawable.ic_more_vert_accent, null);
new MaterialTapTargetPrompt.Builder(ConversationActivity.this,
R.style.OnboardingDialogTheme).setTarget(target)
.setPrimaryText(R.string.introduction_onboarding_title)
.setSecondaryText(R.string.introduction_onboarding_text)
- .setIcon(R.drawable.ic_more_vert_accent)
- .setBackgroundColour(
- ContextCompat.getColor(this, R.color.briar_primary))
+ .setIconDrawable(drawable)
+ .setBackgroundColour(color)
.show();
}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java
index 39dedadaf7fb9007603a78eeaa019f8719d1d5f8..eb0869d911840596680495b60f92ac0555eec45a 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java
@@ -1,17 +1,13 @@
package org.briarproject.briar.android.login;
import android.content.Context;
-import android.graphics.drawable.Drawable;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.R;
import androidx.appcompat.app.AlertDialog;
-import static androidx.core.content.ContextCompat.getColor;
-import static androidx.core.content.ContextCompat.getDrawable;
-import static androidx.core.graphics.drawable.DrawableCompat.setTint;
-import static java.util.Objects.requireNonNull;
+import static org.briarproject.briar.android.util.UiUtils.getDialogIcon;
@NotNullByDefault
class LoginUtils {
@@ -19,9 +15,7 @@ class LoginUtils {
static AlertDialog createKeyStrengthenerErrorDialog(Context ctx) {
AlertDialog.Builder builder =
new AlertDialog.Builder(ctx, R.style.BriarDialogTheme);
- Drawable icon = getDrawable(ctx, R.drawable.alerts_and_states_error);
- setTint(requireNonNull(icon), getColor(ctx, R.color.color_primary));
- builder.setIcon(icon);
+ builder.setIcon(getDialogIcon(ctx, R.drawable.alerts_and_states_error));
builder.setTitle(R.string.dialog_title_cannot_check_password);
builder.setMessage(R.string.dialog_message_cannot_check_password);
builder.setPositiveButton(R.string.ok, null);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java
index 4b0f456fe1002cabc1b3342ac8f70d00fd7457d0..f301f854bcb9f524e805ed441787492c7e457b91 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java
@@ -2,6 +2,7 @@ package org.briarproject.briar.android.navdrawer;
import android.content.Intent;
import android.content.res.Configuration;
+import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.view.LayoutInflater;
@@ -59,6 +60,7 @@ import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModelProvider;
import androidx.lifecycle.ViewModelProviders;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt;
import static android.view.View.GONE;
@@ -433,8 +435,7 @@ public class NavDrawerActivity extends BriarActivity implements
Transport t = getItem(position);
ImageView icon = view.findViewById(R.id.imageView);
- icon.setImageDrawable(ContextCompat.getDrawable(
- NavDrawerActivity.this, t.iconDrawable));
+ icon.setImageResource(t.iconDrawable);
icon.setColorFilter(ContextCompat.getColor(
NavDrawerActivity.this, t.iconColor));
@@ -476,11 +477,13 @@ public class NavDrawerActivity extends BriarActivity implements
private void showTransportsOnboarding(boolean show, ImageView imageView) {
if (show) {
int color = resolveColorAttribute(this, R.attr.colorControlNormal);
+ Drawable drawable = VectorDrawableCompat
+ .create(getResources(), R.drawable.transport_tor, null);
new MaterialTapTargetPrompt.Builder(NavDrawerActivity.this,
R.style.OnboardingDialogTheme).setTarget(imageView)
.setPrimaryText(R.string.network_settings_title)
.setSecondaryText(R.string.transports_onboarding_text)
- .setIcon(R.drawable.transport_tor)
+ .setIconDrawable(drawable)
.setIconDrawableColourFilter(color)
.setBackgroundColour(
ContextCompat.getColor(this, R.color.briar_primary))
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java
index 688700cb9cebb105f312827d5f0f6a7d0e111cfa..d86c9fea5bb5773100977bc8d1b0ba5a23125eb5 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java
@@ -141,8 +141,7 @@ public class TransportsActivity extends BriarActivity {
Transport t = getItem(position);
ImageView icon = view.findViewById(R.id.icon);
- icon.setImageDrawable(ContextCompat.getDrawable(
- TransportsActivity.this, t.iconDrawable));
+ icon.setImageResource(t.iconDrawable);
icon.setColorFilter(ContextCompat.getColor(
TransportsActivity.this, t.iconColor));
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
index 404b7e621ea17abb57584572a97e972566a44992..0039dbd28dd2a3e46c63b47248b7d0cc11e895ae 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
@@ -54,6 +54,7 @@ import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.Observer;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
import static android.content.Context.KEYGUARD_SERVICE;
import static android.content.Context.POWER_SERVICE;
@@ -88,7 +89,6 @@ import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO;
import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES;
import static androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode;
import static androidx.core.content.ContextCompat.getColor;
-import static androidx.core.content.ContextCompat.getDrawable;
import static androidx.core.content.ContextCompat.getSystemService;
import static androidx.core.graphics.drawable.DrawableCompat.setTint;
import static androidx.core.view.ViewCompat.LAYOUT_DIRECTION_RTL;
@@ -436,7 +436,8 @@ public class UiUtils {
}
public static Drawable getDialogIcon(Context ctx, @DrawableRes int resId) {
- Drawable icon = getDrawable(ctx, resId);
+ Drawable icon =
+ VectorDrawableCompat.create(ctx.getResources(), resId, null);
setTint(requireNonNull(icon), getColor(ctx, R.color.color_primary));
return icon;
}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java
index 4dc6c6b3a0b64505c722694afb1bfc450573d838..c54b3ea17d86fa2fe88a5345155e0e153b667e92 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java
@@ -2,7 +2,6 @@ package org.briarproject.briar.android.view;
import android.content.Context;
import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.os.Looper;
import android.util.AttributeSet;
@@ -53,9 +52,8 @@ public class BriarRecyclerView extends FrameLayout {
R.styleable.BriarRecyclerView);
isScrollingToEnd = attributes
.getBoolean(R.styleable.BriarRecyclerView_scrollToEnd, true);
- Drawable drawable = attributes
- .getDrawable(R.styleable.BriarRecyclerView_emptyImage);
- if (drawable != null) setEmptyImage(drawable);
+ int drawableRes = attributes.getResourceId(R.styleable.BriarRecyclerView_emptyImage, -1);
+ if (drawableRes != -1) setEmptyImage(drawableRes);
String emtpyText =
attributes.getString(R.styleable.BriarRecyclerView_emptyText);
if (emtpyText != null) setEmptyText(emtpyText);
@@ -139,11 +137,6 @@ public class BriarRecyclerView extends FrameLayout {
}
}
- public void setEmptyImage(Drawable drawable) {
- if (recyclerView == null) initViews();
- emptyImage.setImageDrawable(drawable);
- }
-
public void setEmptyImage(@DrawableRes int res) {
if (recyclerView == null) initViews();
emptyImage.setImageResource(res);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java
index 07d7f08a633c1c445e603c2a48ed934c3192bfc1..a048d43e29afda7c927fcdf0d10c0cd76bd5478b 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java
@@ -4,6 +4,7 @@ import android.app.Activity;
import android.content.ClipData;
import android.content.Context;
import android.content.Intent;
+import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
@@ -28,6 +29,7 @@ import androidx.customview.view.AbsSavedState;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.Observer;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt;
import static android.os.Build.VERSION.SDK_INT;
@@ -253,12 +255,14 @@ public class TextAttachmentController extends TextSendController
public void showImageOnboarding(Activity activity) {
int color = resolveColorAttribute(activity, R.attr.colorControlNormal);
+ Drawable drawable = VectorDrawableCompat
+ .create(activity.getResources(), R.drawable.ic_image, null);
new MaterialTapTargetPrompt.Builder(activity,
R.style.OnboardingDialogTheme).setTarget(sendButton)
.setPrimaryText(R.string.dialog_title_image_support)
.setSecondaryText(R.string.dialog_message_image_support)
.setBackgroundColour(getColor(activity, R.color.briar_primary))
- .setIcon(R.drawable.ic_image)
+ .setIconDrawable(drawable)
.setIconDrawableColourFilter(color)
.show();
}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TrustIndicatorView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TrustIndicatorView.java
index ec1fc98acbe694b43591bc5e44aee7a6a006b553..464fd0aa78a1c3e4c8123526272a109dc011726c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/TrustIndicatorView.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TrustIndicatorView.java
@@ -8,7 +8,6 @@ import org.briarproject.briar.R;
import androidx.annotation.UiThread;
import androidx.appcompat.widget.AppCompatImageView;
-import androidx.core.content.ContextCompat;
@UiThread
public class TrustIndicatorView extends AppCompatImageView {
@@ -44,7 +43,7 @@ public class TrustIndicatorView extends AppCompatImageView {
default:
res = R.drawable.trust_indicator_unknown;
}
- setImageDrawable(ContextCompat.getDrawable(getContext(), res));
+ setImageResource(res);
setVisibility(VISIBLE);
invalidate();
diff --git a/briar-android/src/main/res/drawable/notification_blog.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_blog.xml
similarity index 58%
rename from briar-android/src/main/res/drawable/notification_blog.xml
rename to briar-android/src/main/res/drawable-anydpi-v24/notification_blog.xml
index d5218f632940886038a1de4cf218d0634d054e88..3432e13122d9e86fa01e12433f26485eddab896a 100644
--- a/briar-android/src/main/res/drawable/notification_blog.xml
+++ b/briar-android/src/main/res/drawable-anydpi-v24/notification_blog.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0">
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M13,12h7v1.5h-7zM13,9.5h7L20,11h-7zM13,14.5h7L20,16h-7zM21,4L3,4c-1.1,0 -2,0.9 -2,2v13c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,6c0,-1.1 -0.9,-2 -2,-2zM21,19h-9L12,6h9v13z"/>
+ android:pathData="M13,12h7v1.5h-7zM13,9.5h7L20,11h-7zM13,14.5h7L20,16h-7zM21,4L3,4c-1.1,0 -2,0.9 -2,2v13c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,6c0,-1.1 -0.9,-2 -2,-2zM21,19h-9L12,6h9v13z" />
</vector>
diff --git a/briar-android/src/main/res/drawable/notification_contact_added.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_contact_added.xml
similarity index 68%
rename from briar-android/src/main/res/drawable/notification_contact_added.xml
rename to briar-android/src/main/res/drawable-anydpi-v24/notification_contact_added.xml
index 48c8339f02f2a2b0ace16a40fe25807dc188f89e..dbeb8ef6019ddab8d2ebb635d5e752dbe33fe776 100644
--- a/briar-android/src/main/res/drawable/notification_contact_added.xml
+++ b/briar-android/src/main/res/drawable-anydpi-v24/notification_contact_added.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0">
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M20,0L4,0v2h16L20,0zM4,24h16v-2L4,22v2zM20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM12,6.75c1.24,0 2.25,1.01 2.25,2.25s-1.01,2.25 -2.25,2.25S9.75,10.24 9.75,9 10.76,6.75 12,6.75zM17,17L7,17v-1.5c0,-1.67 3.33,-2.5 5,-2.5s5,0.83 5,2.5L17,17z"/>
+ android:pathData="M20,0L4,0v2h16L20,0zM4,24h16v-2L4,22v2zM20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM12,6.75c1.24,0 2.25,1.01 2.25,2.25s-1.01,2.25 -2.25,2.25S9.75,10.24 9.75,9 10.76,6.75 12,6.75zM17,17L7,17v-1.5c0,-1.67 3.33,-2.5 5,-2.5s5,0.83 5,2.5L17,17z" />
</vector>
diff --git a/briar-android/src/main/res/drawable/notification_forum.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_forum.xml
similarity index 100%
rename from briar-android/src/main/res/drawable/notification_forum.xml
rename to briar-android/src/main/res/drawable-anydpi-v24/notification_forum.xml
diff --git a/briar-android/src/main/res/drawable-anydpi-v24/notification_lock.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_lock.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cf2c80ccf4fae206872cd7eb188f88ddcf18d6da
--- /dev/null
+++ b/briar-android/src/main/res/drawable-anydpi-v24/notification_lock.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="#FFFFFF">
+ <group android:scaleX="0.92"
+ android:scaleY="0.92"
+ android:translateX="0.96"
+ android:translateY="0.96">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+ </group>
+</vector>
diff --git a/briar-android/src/main/res/drawable/notification_ongoing.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_ongoing.xml
similarity index 100%
rename from briar-android/src/main/res/drawable/notification_ongoing.xml
rename to briar-android/src/main/res/drawable-anydpi-v24/notification_ongoing.xml
diff --git a/briar-android/src/main/res/drawable/notification_private_group.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_private_group.xml
similarity index 74%
rename from briar-android/src/main/res/drawable/notification_private_group.xml
rename to briar-android/src/main/res/drawable-anydpi-v24/notification_private_group.xml
index 55cbde9eeed748f9685ba6738ad3df16f158cfc5..cbe1439552a43ba264e4449690591be4318a4fc2 100644
--- a/briar-android/src/main/res/drawable/notification_private_group.xml
+++ b/briar-android/src/main/res/drawable-anydpi-v24/notification_private_group.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0">
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
+ android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z" />
</vector>
diff --git a/briar-android/src/main/res/drawable/notification_private_message.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_private_message.xml
similarity index 60%
rename from briar-android/src/main/res/drawable/notification_private_message.xml
rename to briar-android/src/main/res/drawable-anydpi-v24/notification_private_message.xml
index b42ea09e2211e8f48e8e950c8918509095b0c260..48240fe7529542301cef75fac8fcda33573a4b47 100644
--- a/briar-android/src/main/res/drawable/notification_private_message.xml
+++ b/briar-android/src/main/res/drawable-anydpi-v24/notification_private_message.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0">
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
+ android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z" />
</vector>
diff --git a/briar-android/src/main/res/drawable-anydpi-v24/notification_signout.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_signout.xml
new file mode 100644
index 0000000000000000000000000000000000000000..73940840c7d99835a5918677057857ccca3f1e1a
--- /dev/null
+++ b/briar-android/src/main/res/drawable-anydpi-v24/notification_signout.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="#FFFFFF">
+ <group android:scaleX="0.92"
+ android:scaleY="0.92"
+ android:translateX="0.96"
+ android:translateY="0.96">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M16,17V14H9V10H16V7L21,12L16,17M14,2A2,2 0,0 1,16 4V6H14V4H5V20H14V18H16V20A2,2 0,0 1,14 22H5A2,2 0,0 1,3 20V4A2,2 0,0 1,5 2H14Z"/>
+ </group>
+</vector>
diff --git a/briar-android/src/main/res/drawable-hdpi/notification_blog.png b/briar-android/src/main/res/drawable-hdpi/notification_blog.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8af309d694a43772ff245a790d3ddcf8f4fa3db
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notification_blog.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notification_contact_added.png b/briar-android/src/main/res/drawable-hdpi/notification_contact_added.png
new file mode 100644
index 0000000000000000000000000000000000000000..562bde2a2640cee2549eae5be2e81cc2c649f6cc
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notification_contact_added.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notification_forum.png b/briar-android/src/main/res/drawable-hdpi/notification_forum.png
new file mode 100644
index 0000000000000000000000000000000000000000..b97be3b0966a8de7d5ec59adf68505445af0ae96
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notification_forum.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notification_lock.png b/briar-android/src/main/res/drawable-hdpi/notification_lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf1d2dbfe81075f0c325bcefc7c7cd55f9317440
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notification_lock.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notification_ongoing.png b/briar-android/src/main/res/drawable-hdpi/notification_ongoing.png
new file mode 100644
index 0000000000000000000000000000000000000000..199c064002bda7bf2ae5afd7f7ca09abd1be04e9
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notification_ongoing.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notification_private_group.png b/briar-android/src/main/res/drawable-hdpi/notification_private_group.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bffc2f605f57809b2f54aaa0c921fbec3cc7bde
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notification_private_group.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notification_private_message.png b/briar-android/src/main/res/drawable-hdpi/notification_private_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f28a4dddf29be20d45d9c870aff52af094f86ee
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notification_private_message.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notification_signout.png b/briar-android/src/main/res/drawable-hdpi/notification_signout.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fa1f7ed8de0209d1ac557bc23096732502f72b7
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notification_signout.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notification_blog.png b/briar-android/src/main/res/drawable-mdpi/notification_blog.png
new file mode 100644
index 0000000000000000000000000000000000000000..34c7dc5510328506b29bc96bc258212f667938e0
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notification_blog.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notification_contact_added.png b/briar-android/src/main/res/drawable-mdpi/notification_contact_added.png
new file mode 100644
index 0000000000000000000000000000000000000000..194314c653d6bd66b9bd825c513a12c4535937eb
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notification_contact_added.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notification_forum.png b/briar-android/src/main/res/drawable-mdpi/notification_forum.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef1e2504dda5e8701259e46c1f2a60b5725371dd
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notification_forum.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notification_lock.png b/briar-android/src/main/res/drawable-mdpi/notification_lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..780388e399398beea23eb68796b550d1de5fc992
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notification_lock.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notification_ongoing.png b/briar-android/src/main/res/drawable-mdpi/notification_ongoing.png
new file mode 100644
index 0000000000000000000000000000000000000000..b68561b2b588127c93df6b5be28611836bdbd70a
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notification_ongoing.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notification_private_group.png b/briar-android/src/main/res/drawable-mdpi/notification_private_group.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f52bc248b9b538fb27ef575366efa1946206c8d
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notification_private_group.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notification_private_message.png b/briar-android/src/main/res/drawable-mdpi/notification_private_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..f095ee707ddc50f47fd3855ab18b2df5b807dbe7
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notification_private_message.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notification_signout.png b/briar-android/src/main/res/drawable-mdpi/notification_signout.png
new file mode 100644
index 0000000000000000000000000000000000000000..07db32ef19f7f11e629bbf6bde001f318ca626b1
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notification_signout.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_blog.png b/briar-android/src/main/res/drawable-xhdpi/notification_blog.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6c16bd11976d9c6f18a51166c0798fec5ed2235
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notification_blog.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_contact_added.png b/briar-android/src/main/res/drawable-xhdpi/notification_contact_added.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f5d2afa3c9a098754dca241d7ff1c325309c768
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notification_contact_added.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_forum.png b/briar-android/src/main/res/drawable-xhdpi/notification_forum.png
new file mode 100644
index 0000000000000000000000000000000000000000..990c390c77ee25e3a53da4e355d0646ec7c3e1e4
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notification_forum.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_lock.png b/briar-android/src/main/res/drawable-xhdpi/notification_lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..970eb99284a85cd1011c4faadd7ac7c520095724
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notification_lock.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_ongoing.png b/briar-android/src/main/res/drawable-xhdpi/notification_ongoing.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cdafa9d302f6f944b018d4e8ac4c3412ad6f06e
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notification_ongoing.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_private_group.png b/briar-android/src/main/res/drawable-xhdpi/notification_private_group.png
new file mode 100644
index 0000000000000000000000000000000000000000..5082366e6fc9dbfc90c5722aa27e52541a6f8f2c
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notification_private_group.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_private_message.png b/briar-android/src/main/res/drawable-xhdpi/notification_private_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b1ff6684d7c1e56a931256818a69feb6ca08c6b
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notification_private_message.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_signout.png b/briar-android/src/main/res/drawable-xhdpi/notification_signout.png
new file mode 100644
index 0000000000000000000000000000000000000000..68f0c37d9e7d4f64fd7050d380561cc381b0f81e
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notification_signout.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notification_blog.png b/briar-android/src/main/res/drawable-xxhdpi/notification_blog.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f16ce3609ed82215a8c11d31c322defd968475d
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notification_blog.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notification_contact_added.png b/briar-android/src/main/res/drawable-xxhdpi/notification_contact_added.png
new file mode 100644
index 0000000000000000000000000000000000000000..6eb750cfd919e8b11e2755b322c307eef7a30f31
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notification_contact_added.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notification_forum.png b/briar-android/src/main/res/drawable-xxhdpi/notification_forum.png
new file mode 100644
index 0000000000000000000000000000000000000000..68473d89765772110a20edeffa7bca2fd233f558
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notification_forum.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notification_lock.png b/briar-android/src/main/res/drawable-xxhdpi/notification_lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..848892ae9b399636170a07d457b13a0aab49aeed
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notification_lock.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notification_ongoing.png b/briar-android/src/main/res/drawable-xxhdpi/notification_ongoing.png
new file mode 100644
index 0000000000000000000000000000000000000000..af601574273fb069c31b95c81fc5a14856d220e0
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notification_ongoing.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notification_private_group.png b/briar-android/src/main/res/drawable-xxhdpi/notification_private_group.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1854cad9df150ad3f5af56491b2cfc6ef20418a
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notification_private_group.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notification_private_message.png b/briar-android/src/main/res/drawable-xxhdpi/notification_private_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..af4463c7adbbb805631391d792d38e5ce9d3bc61
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notification_private_message.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notification_signout.png b/briar-android/src/main/res/drawable-xxhdpi/notification_signout.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b62d66bc252688d25328961bdbfe7f52149cf3d
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notification_signout.png differ
diff --git a/briar-android/src/main/res/layout-h650dp/navigation_header.xml b/briar-android/src/main/res/layout-h650dp/navigation_header.xml
index 92a452e943902431686200198ca9510027c528b3..4661f362c69b2605b55227276fd4f99fca19f2e4 100644
--- a/briar-android/src/main/res/layout-h650dp/navigation_header.xml
+++ b/briar-android/src/main/res/layout-h650dp/navigation_header.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="85dp"
@@ -16,6 +17,6 @@
android:layout_marginRight="@dimen/margin_medium"
android:layout_marginBottom="@dimen/margin_medium"
android:contentDescription="@string/app_name"
- android:src="@drawable/navigation_drawer_header" />
+ app:srcCompat="@drawable/navigation_drawer_header" />
</FrameLayout>
diff --git a/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml b/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml
index 91b1da90109bf5a350309b4ecb23909a80642f4e..fb2fe2c215811074057366380ec55c9653e1e88a 100644
--- a/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml
+++ b/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml
@@ -20,11 +20,11 @@
android:adjustViewBounds="true"
android:padding="@dimen/margin_medium"
android:scaleType="fitCenter"
- android:src="@drawable/qr_code_intro"
app:layout_constraintBottom_toBottomOf="@id/explanationText"
app:layout_constraintEnd_toStartOf="@id/explanationText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
+ app:srcCompat="@drawable/qr_code_intro"
app:tint="@color/color_primary"
tools:ignore="ContentDescription" />
@@ -38,11 +38,11 @@
android:paddingTop="@dimen/margin_large"
android:paddingEnd="@dimen/margin_large"
android:scaleType="fitCenter"
- android:src="@drawable/qr_code_explanation"
app:layout_constraintBottom_toTopOf="@id/explanationText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/diagram"
app:layout_constraintTop_toTopOf="parent"
+ app:srcCompat="@drawable/qr_code_explanation"
tools:ignore="ContentDescription" />
<TextView
diff --git a/briar-android/src/main/res/layout/activity_nav_drawer.xml b/briar-android/src/main/res/layout/activity_nav_drawer.xml
index e324af139860b6fc73414f96176f0d348be3b233..44830d9c5fcad67a5d5942bf3a575f173d5deebd 100644
--- a/briar-android/src/main/res/layout/activity_nav_drawer.xml
+++ b/briar-android/src/main/res/layout/activity_nav_drawer.xml
@@ -52,7 +52,7 @@
android:layout_height="0dp"
android:contentDescription="@string/close"
android:scaleType="center"
- android:src="@drawable/ic_close"
+ app:srcCompat="@drawable/ic_close"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
diff --git a/briar-android/src/main/res/layout/activity_sharing_status.xml b/briar-android/src/main/res/layout/activity_sharing_status.xml
index 52c2af16fe7edd8450b685cd225fd7f5b3d9630c..094495c44967e5d7251eb3aeca652c57dd36ea36 100644
--- a/briar-android/src/main/res/layout/activity_sharing_status.xml
+++ b/briar-android/src/main/res/layout/activity_sharing_status.xml
@@ -13,10 +13,10 @@
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:elevation="@dimen/margin_tiny"
- android:src="@drawable/ic_info_white"
app:layout_constraintBottom_toTopOf="@+id/divider"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
+ app:srcCompat="@drawable/ic_info_white"
app:tint="?attr/colorControlNormal" />
<TextView
diff --git a/briar-android/src/main/res/layout/activity_unlock.xml b/briar-android/src/main/res/layout/activity_unlock.xml
index 8214c059f1ac89063353a504be2042e1ad2473f7..71380438022ef6e93037928c9bd17d568c7a1e93 100644
--- a/briar-android/src/main/res/layout/activity_unlock.xml
+++ b/briar-android/src/main/res/layout/activity_unlock.xml
@@ -12,12 +12,12 @@
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_margin="@dimen/margin_large"
- android:src="@drawable/splash_screen"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.1"
+ app:srcCompat="@drawable/splash_screen"
app:tint="?attr/colorControlNormal" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/author_view.xml b/briar-android/src/main/res/layout/author_view.xml
index a90aeb046a24e1a26b3dc73ab5973121cc0c933a..99d3cc04c11c58b43d8df717793454fda69c1212 100644
--- a/briar-android/src/main/res/layout/author_view.xml
+++ b/briar-android/src/main/res/layout/author_view.xml
@@ -29,10 +29,10 @@
android:contentDescription="@string/blogs_reblog_button"
android:padding="2dp"
android:scaleType="fitCenter"
- android:src="@drawable/ic_repeat"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@+id/avatar"
- app:layout_constraintEnd_toEndOf="@+id/avatar" />
+ app:layout_constraintEnd_toEndOf="@+id/avatar"
+ app:srcCompat="@drawable/ic_repeat" />
<com.vanniktech.emoji.EmojiTextView
android:id="@+id/authorName"
diff --git a/briar-android/src/main/res/layout/emoji_text_input_view.xml b/briar-android/src/main/res/layout/emoji_text_input_view.xml
index e5979c12e7fc8c29ed520eca4850b2cb6faab71a..296f3cab083d6a402feaa3408894b0ecd23d72fb 100644
--- a/briar-android/src/main/res/layout/emoji_text_input_view.xml
+++ b/briar-android/src/main/res/layout/emoji_text_input_view.xml
@@ -16,7 +16,7 @@
android:background="?attr/selectableItemBackground"
android:padding="@dimen/margin_small"
android:scaleType="center"
- android:src="@drawable/ic_emoji_toggle"
+ app:srcCompat="@drawable/ic_emoji_toggle"
app:tint="?attr/colorControlNormal" />
<com.vanniktech.emoji.EmojiEditText
diff --git a/briar-android/src/main/res/layout/fragment_crash.xml b/briar-android/src/main/res/layout/fragment_crash.xml
index 9603406e5b2f8c9b1a1c038d34190df1f1d44f7d..cbfdc7ab21c43e4235ab24c920f826d62503cc0e 100644
--- a/briar-android/src/main/res/layout/fragment_crash.xml
+++ b/briar-android/src/main/res/layout/fragment_crash.xml
@@ -24,7 +24,6 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:padding="8dp"
- android:src="@drawable/ic_crash"
app:layout_constraintBottom_toTopOf="@+id/crashed"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
@@ -32,6 +31,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
+ app:srcCompat="@drawable/ic_crash"
app:tint="?attr/colorControlNormal"
tools:ignore="ContentDescription" />
diff --git a/briar-android/src/main/res/layout/fragment_error.xml b/briar-android/src/main/res/layout/fragment_error.xml
index 300ff69a09e44493c00452ce93adaf2afd47c637..bd663a9e302ff39492b6008349f13fee25622857 100644
--- a/briar-android/src/main/res/layout/fragment_error.xml
+++ b/briar-android/src/main/res/layout/fragment_error.xml
@@ -14,10 +14,10 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
- android:src="@drawable/alerts_and_states_error"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
+ app:srcCompat="@drawable/alerts_and_states_error"
app:tint="?attr/colorControlNormal"
tools:ignore="ContentDescription" />
diff --git a/briar-android/src/main/res/layout/fragment_error_contact_exchange.xml b/briar-android/src/main/res/layout/fragment_error_contact_exchange.xml
index 3e18f40b116374da134228df83a0ebd65a56dbce..d06ef1187bdabe7a66c18323fbc88246c4a1f3b2 100644
--- a/briar-android/src/main/res/layout/fragment_error_contact_exchange.xml
+++ b/briar-android/src/main/res/layout/fragment_error_contact_exchange.xml
@@ -30,10 +30,10 @@
android:layout_marginTop="16dp"
android:layout_marginRight="16dp"
android:scaleType="fitCenter"
- android:src="@drawable/qr_code_error"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/errorTitle"
+ app:srcCompat="@drawable/qr_code_error"
app:tint="?attr/colorControlNormal"
tools:ignore="ContentDescription" />
diff --git a/briar-android/src/main/res/layout/fragment_keyagreement_id.xml b/briar-android/src/main/res/layout/fragment_keyagreement_id.xml
index 955e8e71ecdaaadcaa7b5f3b1631263f900ed926..eb29e78fce98b84a70d5c4487cb128915b5d53e1 100644
--- a/briar-android/src/main/res/layout/fragment_keyagreement_id.xml
+++ b/briar-android/src/main/res/layout/fragment_keyagreement_id.xml
@@ -19,11 +19,11 @@
android:adjustViewBounds="true"
android:paddingBottom="@dimen/margin_large"
android:scaleType="fitCenter"
- android:src="@drawable/qr_code_intro"
app:layout_constraintBottom_toTopOf="@id/explanationImage"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
+ app:srcCompat="@drawable/qr_code_intro"
app:tint="@color/color_primary" />
<ImageView
@@ -35,11 +35,11 @@
android:paddingTop="@dimen/margin_large"
android:paddingRight="@dimen/margin_large"
android:scaleType="fitCenter"
- android:src="@drawable/qr_code_explanation"
app:layout_constraintBottom_toTopOf="@id/explanationText"
app:layout_constraintEnd_toEndOf="@id/diagram"
app:layout_constraintStart_toStartOf="@id/diagram"
app:layout_constraintTop_toBottomOf="@id/diagram"
+ app:srcCompat="@drawable/qr_code_explanation"
tools:ignore="ContentDescription" />
<TextView
diff --git a/briar-android/src/main/res/layout/fragment_link_exchange.xml b/briar-android/src/main/res/layout/fragment_link_exchange.xml
index e5bbbc2c1d27c55abd6bcf3cdf31792bf61e0e34..9f6a71394e3976e63035b5471087f7cea6e839b5 100644
--- a/briar-android/src/main/res/layout/fragment_link_exchange.xml
+++ b/briar-android/src/main/res/layout/fragment_link_exchange.xml
@@ -81,9 +81,9 @@
android:layout_marginTop="32dp"
android:background="@drawable/bubble_accent"
android:scaleType="center"
- android:src="@drawable/ic_call_made"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/stepOneText"
+ app:srcCompat="@drawable/ic_call_made"
app:tint="@android:color/white" />
<TextView
@@ -123,11 +123,11 @@
style="@style/BriarButtonFlat.Positive.Tiny"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:drawableStart="@drawable/ic_content_copy"
- android:drawableLeft="@drawable/ic_content_copy"
android:drawablePadding="8dp"
android:enabled="false"
android:text="@string/copy_button"
+ app:drawableLeftCompat="@drawable/ic_content_copy"
+ app:drawableStartCompat="@drawable/ic_content_copy"
app:layout_constraintEnd_toStartOf="@id/shareButton"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintHorizontal_chainStyle="packed"
@@ -139,11 +139,11 @@
style="@style/BriarButtonFlat.Positive.Tiny"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:drawableStart="@drawable/social_share_blue"
- android:drawableLeft="@drawable/social_share_blue"
android:drawablePadding="8dp"
android:enabled="false"
android:text="@string/share_button"
+ app:drawableLeftCompat="@drawable/social_share_blue"
+ app:drawableStartCompat="@drawable/social_share_blue"
app:layout_constraintBottom_toBottomOf="@id/copyButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
@@ -157,9 +157,9 @@
android:layout_marginTop="16dp"
android:background="@drawable/bubble_accent"
android:scaleType="center"
- android:src="@drawable/ic_call_received"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/copyButton"
+ app:srcCompat="@drawable/ic_call_received"
app:tint="@android:color/white" />
<TextView
@@ -202,10 +202,10 @@
style="@style/BriarButtonFlat.Positive.Tiny"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:drawableStart="@drawable/ic_content_paste"
- android:drawableLeft="@drawable/ic_content_paste"
android:drawablePadding="8dp"
android:text="@string/paste_button"
+ app:drawableLeftCompat="@drawable/ic_content_paste"
+ app:drawableStartCompat="@drawable/ic_content_paste"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
diff --git a/briar-android/src/main/res/layout/fragment_nickname.xml b/briar-android/src/main/res/layout/fragment_nickname.xml
index 62021874f4e59b6dc875ac8aff106a5e204e1d19..197078cbf3ff818d26eeb2cb01245861cb920e84 100644
--- a/briar-android/src/main/res/layout/fragment_nickname.xml
+++ b/briar-android/src/main/res/layout/fragment_nickname.xml
@@ -77,13 +77,13 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="32dp"
- android:src="@drawable/ic_nickname"
app:layout_constraintBottom_toTopOf="@+id/nicknameIcon"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHeight_max="256dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/stepOneText"
+ app:srcCompat="@drawable/ic_nickname"
tools:ignore="ContentDescription" />
<androidx.appcompat.widget.AppCompatImageView
@@ -93,10 +93,10 @@
android:layout_marginTop="32dp"
android:background="@drawable/bubble_accent"
android:scaleType="center"
- android:src="@drawable/ic_person"
app:layout_constraintBottom_toTopOf="@+id/contactNameLayout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView"
+ app:srcCompat="@drawable/ic_person"
app:tint="@android:color/white" />
<TextView
diff --git a/briar-android/src/main/res/layout/fragment_open_database.xml b/briar-android/src/main/res/layout/fragment_open_database.xml
index 6dabc373546d7bfa98f36cabee8c1a9e73c392d5..41f5c071043bf47d4349e50cfdd3da41908e7587 100644
--- a/briar-android/src/main/res/layout/fragment_open_database.xml
+++ b/briar-android/src/main/res/layout/fragment_open_database.xml
@@ -10,13 +10,13 @@
android:layout_width="128dp"
android:layout_height="128dp"
android:scaleType="center"
- android:src="@drawable/startup_lock"
app:layout_constraintBottom_toTopOf="@+id/textView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.5"
app:layout_constraintVertical_chainStyle="packed"
+ app:srcCompat="@drawable/startup_lock"
app:tint="@color/briar_accent"
tools:ignore="ContentDescription" />
diff --git a/briar-android/src/main/res/layout/fragment_sign_out.xml b/briar-android/src/main/res/layout/fragment_sign_out.xml
index 610f7fac1f87be417f0d0ecbafa43f14c654e35d..c701bf28ca96b24c1bb26647114c8fff2658375b 100644
--- a/briar-android/src/main/res/layout/fragment_sign_out.xml
+++ b/briar-android/src/main/res/layout/fragment_sign_out.xml
@@ -10,13 +10,13 @@
android:layout_width="128dp"
android:layout_height="128dp"
android:scaleType="center"
- android:src="@drawable/startup_lock"
app:layout_constraintBottom_toTopOf="@+id/textView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.5"
app:layout_constraintVertical_chainStyle="packed"
+ app:srcCompat="@drawable/startup_lock"
app:tint="@color/briar_primary"
tools:ignore="ContentDescription" />
diff --git a/briar-android/src/main/res/layout/image_preview.xml b/briar-android/src/main/res/layout/image_preview.xml
index 9ec0317e9db1741aa77af6220a169a478089b56f..83bd2271e0e12d2b9a8295a4b63ee1f74139b7f9 100644
--- a/briar-android/src/main/res/layout/image_preview.xml
+++ b/briar-android/src/main/res/layout/image_preview.xml
@@ -38,13 +38,13 @@
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
- android:src="@drawable/ic_close"
app:backgroundTint="@color/briar_accent"
app:fabCustomSize="26dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0"
- app:maxImageSize="18dp" />
+ app:maxImageSize="18dp"
+ app:srcCompat="@drawable/ic_close" />
</merge>
diff --git a/briar-android/src/main/res/layout/introduction_message.xml b/briar-android/src/main/res/layout/introduction_message.xml
index 518fa2f91965d4b0006f28727acd4dc3050a424e..97387d6f683964850cfa77acaaa4a4ed8d080c1e 100644
--- a/briar-android/src/main/res/layout/introduction_message.xml
+++ b/briar-android/src/main/res/layout/introduction_message.xml
@@ -43,11 +43,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_large"
- android:src="@drawable/ic_contact_introduction"
app:layout_constraintBottom_toBottomOf="@+id/barrier"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/avatarContact2"
+ app:srcCompat="@drawable/ic_contact_introduction"
app:tint="?attr/colorControlNormal"
tools:ignore="ContentDescription" />
diff --git a/briar-android/src/main/res/layout/list_item_blog_post.xml b/briar-android/src/main/res/layout/list_item_blog_post.xml
index 293b69ae3324c78631db046be6293eae026c8d0a..fa53019cf2ef5897c65adf6ca2dadb53ac6f7bc7 100644
--- a/briar-android/src/main/res/layout/list_item_blog_post.xml
+++ b/briar-android/src/main/res/layout/list_item_blog_post.xml
@@ -47,9 +47,9 @@
android:layout_height="@dimen/button_size"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/blogs_reblog_comment_hint"
- android:src="@drawable/ic_repeat"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
+ app:srcCompat="@drawable/ic_repeat"
app:tint="?attr/colorControlNormal" />
<com.vanniktech.emoji.EmojiTextView
diff --git a/briar-android/src/main/res/layout/list_item_pending_contact.xml b/briar-android/src/main/res/layout/list_item_pending_contact.xml
index 40ea591ef31e37d0efd294e8a34a3d8cc96d7032..a4258db0377a7cc74e1a88b9a4061603c07c057e 100644
--- a/briar-android/src/main/res/layout/list_item_pending_contact.xml
+++ b/briar-android/src/main/res/layout/list_item_pending_contact.xml
@@ -41,10 +41,10 @@
android:layout_height="@dimen/button_size"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/groups_remove"
- android:src="@drawable/action_delete_black"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/name"
app:layout_constraintTop_toTopOf="parent"
+ app:srcCompat="@drawable/action_delete_black"
app:tint="?attr/colorControlNormal" />
<TextView
diff --git a/briar-android/src/main/res/layout/list_item_revealable_contact.xml b/briar-android/src/main/res/layout/list_item_revealable_contact.xml
index 059077098505c2bd85430e6f5701498eec698881..89cf72983d6e8a2d05bd902ab7534ef4b351a267 100644
--- a/briar-android/src/main/res/layout/list_item_revealable_contact.xml
+++ b/briar-android/src/main/res/layout/list_item_revealable_contact.xml
@@ -40,9 +40,9 @@
android:layout_marginStart="@dimen/listitem_horizontal_margin"
android:layout_marginLeft="@dimen/listitem_horizontal_margin"
android:layout_marginTop="4dp"
- android:src="@drawable/ic_visibility"
app:layout_constraintStart_toEndOf="@+id/avatarView"
app:layout_constraintTop_toBottomOf="@+id/nameView"
+ app:srcCompat="@drawable/ic_visibility"
app:tint="?attr/colorControlNormal"
tools:ignore="ContentDescription" />
diff --git a/briar-android/src/main/res/layout/list_item_rss_feed.xml b/briar-android/src/main/res/layout/list_item_rss_feed.xml
index 81414aa96da6b669fe42ac15ee1b864acfd02ba6..f5f76e0244d2126256e1678166ffaa23dd02be9a 100644
--- a/briar-android/src/main/res/layout/list_item_rss_feed.xml
+++ b/briar-android/src/main/res/layout/list_item_rss_feed.xml
@@ -27,9 +27,9 @@
android:layout_margin="@dimen/margin_medium"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/delete"
- android:src="@drawable/action_delete_black"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
+ app:srcCompat="@drawable/action_delete_black"
app:tint="?attr/colorControlNormal" />
<TextView
diff --git a/briar-android/src/main/res/layout/power_view.xml b/briar-android/src/main/res/layout/power_view.xml
index cf558ce5408c9993f875c7f12765e4c46656edfc..ea8ba5b2850d407044927792e9dc8773f4753c7f 100644
--- a/briar-android/src/main/res/layout/power_view.xml
+++ b/briar-android/src/main/res/layout/power_view.xml
@@ -26,11 +26,11 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_margin="@dimen/margin_medium"
- android:src="@drawable/ic_check_white"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@+id/button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/button"
+ app:srcCompat="@drawable/ic_check_white"
app:tint="?attr/colorControlNormal"
tools:ignore="ContentDescription" />
@@ -52,10 +52,10 @@
android:layout_height="24dp"
android:layout_margin="@dimen/margin_medium"
android:contentDescription="@string/help"
- android:src="@drawable/ic_help_outline_white"
android:tint="@color/briar_button_text_positive"
app:layout_constraintBottom_toBottomOf="@+id/button"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="@+id/button" />
+ app:layout_constraintTop_toTopOf="@+id/button"
+ app:srcCompat="@drawable/ic_help_outline_white" />
</merge>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/qr_code_view.xml b/briar-android/src/main/res/layout/qr_code_view.xml
index 351ad5765b9264c171de5059f68012b145cbbcc9..60354905678ec40242e2ee40a7eb9b29f0085e52 100644
--- a/briar-android/src/main/res/layout/qr_code_view.xml
+++ b/briar-android/src/main/res/layout/qr_code_view.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:showIn="@layout/fragment_keyagreement_qr">
@@ -25,6 +26,6 @@
android:alpha="0.54"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/show_qr_code_fullscreen"
- android:src="@drawable/ic_fullscreen_black_48dp" />
+ app:srcCompat="@drawable/ic_fullscreen_black_48dp" />
</merge>
diff --git a/briar-android/src/main/res/layout/splash.xml b/briar-android/src/main/res/layout/splash.xml
index 410dbb74d3b7b47389aa1590c83bcc0e53b5d38a..0cd22a43c5f5a5a6d18c7bc7ea0ea28094f44752 100644
--- a/briar-android/src/main/res/layout/splash.xml
+++ b/briar-android/src/main/res/layout/splash.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -9,6 +10,6 @@
android:layout_gravity="center"
android:layout_margin="@dimen/margin_xxlarge"
android:contentDescription="@string/app_name"
- android:src="@drawable/splash_screen" />
+ app:srcCompat="@drawable/splash_screen" />
</FrameLayout>
diff --git a/briar-android/src/main/res/layout/view_composite_send_button.xml b/briar-android/src/main/res/layout/view_composite_send_button.xml
index 8ecfb1b8166ee0dc13b8335417ba32a86a1f6567..b72677e71fa5847c2de8930eeca6ebe676a42d14 100644
--- a/briar-android/src/main/res/layout/view_composite_send_button.xml
+++ b/briar-android/src/main/res/layout/view_composite_send_button.xml
@@ -19,8 +19,8 @@
android:focusable="true"
android:padding="4dp"
android:scaleType="center"
- android:src="@drawable/ic_image_off"
android:visibility="invisible"
+ app:srcCompat="@drawable/ic_image_off"
app:tint="?attr/colorControlNormal" />
<androidx.appcompat.widget.AppCompatImageButton
@@ -34,7 +34,7 @@
android:focusable="true"
android:padding="4dp"
android:scaleType="center"
- android:src="@drawable/social_send_now_white"
+ app:srcCompat="@drawable/social_send_now_white"
app:tint="@color/briar_accent" />
<ProgressBar
diff --git a/briar-android/src/main/res/values/styles.xml b/briar-android/src/main/res/values/styles.xml
index d5509d0120d720c51f87e477e73e447b9b8fd39f..e8094ba3e874ef474d3bfe372d7d4c655e0c3a8e 100644
--- a/briar-android/src/main/res/values/styles.xml
+++ b/briar-android/src/main/res/values/styles.xml
@@ -141,7 +141,7 @@
<style name="StepBubble.Completed">
<item name="android:background">@drawable/bubble_completed</item>
<item name="android:scaleType">center</item>
- <item name="android:src">@drawable/ic_check_white</item>
+ <item name="srcCompat">@drawable/ic_check_white</item>
</style>
</resources>
\ No newline at end of file