Feature/lucide icons pt4 (#869)

* info icon (ic_info)

* icon video off (ic_video_off)

* emoji fallback icon (ic_square_x)

* expand icon (ic_maximize_e)

* default profile icon and video swap icon

* missed call icon

* chevron up and down

* icons for image edit screen and emoji stickers

* Giphy screen icons + reworked search bar

* removed unused icons

app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt

@@ -68,7 +68,7 @@ class ProfilePictureView @JvmOverloads constructor(
     }
 
     private fun createUnknownRecipientDrawable(): Drawable {
-        return ResourceContactPhoto(R.drawable.ic_profile_default)
+        return ResourceContactPhoto(R.drawable.ic_user_filled_custom)
             .asDrawable(context, ContactColors.UNKNOWN_COLOR.toConversationColor(context), false, resourcePadding)
     }
 

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiImageView.java

@@ -37,7 +37,7 @@ public class EmojiImageView extends AppCompatImageView {
       Drawable emojiDrawable = EmojiProvider.getEmojiDrawable(getContext(), emoji);
       if (emojiDrawable == null) {
         // fallback
-        setImageResource(R.drawable.ic_outline_disabled_by_default_24);
+        setImageResource(R.drawable.ic_square_x);
       } else {
         setImageDrawable(emojiDrawable);
       }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt

@@ -351,13 +351,16 @@ fun ExpandButton(modifier: Modifier = Modifier, onClick: () -> Unit) {
     Surface(
         shape = CircleShape,
         color = blackAlpha40,
-        modifier = modifier,
+        modifier = modifier
+            .clickable { onClick() },
         contentColor = Color.White,
     ) {
         Icon(
-            painter = painterResource(id = R.drawable.ic_expand),
+            painter = painterResource(id = R.drawable.ic_maximize_2),
             contentDescription = stringResource(id = R.string.AccessibilityId_expand),
-            modifier = Modifier.clickable { onClick() },
+            modifier = Modifier
+                .padding(LocalDimensions.current.xxsSpacing)
+                .size(LocalDimensions.current.xsSpacing),
         )
     }
 }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt

@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
@@ -47,10 +48,17 @@ class ControlMessageView : LinearLayout {
 
     private val binding = ViewControlMessageBinding.inflate(LayoutInflater.from(context), this, true)
 
-    private val infoDrawable by lazy {
-        val d = ResourcesCompat.getDrawable(resources, R.drawable.ic_info_outline_white_24dp, context.theme)
-        d?.setTint(context.getColorFromAttr(R.attr.message_received_text_color))
-        d
+    val iconSize by lazy {
+        resources.getDimensionPixelSize(R.dimen.medium_spacing)
+    }
+
+    private val infoDrawable: Drawable? by lazy {
+        val icon = ResourcesCompat.getDrawable(resources, R.drawable.ic_info, context.theme)?.toBitmap()
+        if(icon != null) {
+            val d = BitmapDrawable(resources, Bitmap.createScaledBitmap(icon, iconSize, iconSize, true))
+            d.setTint(context.getColorFromAttr(R.attr.message_received_text_color))
+            d
+        } else null
     }
 
     constructor(context: Context) : super(context)
@@ -61,10 +69,6 @@ class ControlMessageView : LinearLayout {
 
     val controlContentView: View get() = binding.controlContentView
 
-    val iconSize by lazy {
-        resources.getDimensionPixelSize(R.dimen.medium_spacing)
-    }
-
     init {
         layoutParams = RecyclerView.LayoutParams(RecyclerView.LayoutParams.MATCH_PARENT, RecyclerView.LayoutParams.WRAP_CONTENT)
     }
@@ -138,7 +142,7 @@ class ControlMessageView : LinearLayout {
                 val drawableRes = when {
                     message.isIncomingCall -> R.drawable.ic_phone_incoming
                     message.isOutgoingCall -> R.drawable.ic_phone_outgoing
-                    else -> R.drawable.ic_missed_call
+                    else -> R.drawable.ic_phone_missed
                 }
 
                 // Since this is using text drawable we need to go the long way around to size and style the drawable

app/src/main/java/org/thoughtcrime/securesms/groups/compose/EditGroupScreen.kt

@@ -390,7 +390,7 @@ private fun MemberActionSheet(
             if (BuildConfig.DEBUG && member.canPromote) {
                 this += ActionSheetItemData(
                     title = context.getString(R.string.adminPromoteToAdmin),
-                    iconRes = R.drawable.ic_profile_default,
+                    iconRes = R.drawable.ic_user_filled_custom,
                     onClick = onPromote
                 )
             }

app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.graphics.Color;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
@@ -96,7 +97,7 @@ public final class ImageEditorHud extends LinearLayout {
   }
 
   private void updateCropAspectLockImage(boolean cropAspectLocked) {
-    cropAspectLock.setImageDrawable(getResources().getDrawable(cropAspectLocked ? R.drawable.ic_crop_lock_32 : R.drawable.ic_crop_unlock_32));
+    cropAspectLock.setImageDrawable(ResourcesCompat.getDrawable(getResources(), cropAspectLocked ? R.drawable.ic_crop_lock_custom : R.drawable.ic_crop_unlock_custom, getContext().getTheme()));
   }
 
   private void initializeVisibilityMap() {

app/src/main/java/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java

@@ -36,11 +36,11 @@ public class StickerSelectActivity extends FragmentActivity implements StickerSe
   public static final String EXTRA_STICKER_FILE = "extra_sticker_file";
 
   private static final int[] TAB_TITLES = new int[] {
-      R.drawable.ic_tag_faces_white_24dp,
-      R.drawable.ic_work_white_24dp,
-      R.drawable.ic_pets_white_24dp,
-      R.drawable.ic_local_dining_white_24dp,
-      R.drawable.ic_wb_sunny_white_24dp
+      R.drawable.ic_emoji_custom,
+      R.drawable.ic_briefcase,
+      R.drawable.ic_paw_print,
+      R.drawable.ic_utensils_crossed,
+      R.drawable.ic_sun
   };
 
   @Override

app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt

@@ -440,7 +440,7 @@ private fun BaseAvatar(
         // image
         if (LocalInspectionMode.current) { // this part is used for previews only
             Image(
-                painterResource(id = R.drawable.ic_profile_default),
+                painterResource(id = R.drawable.ic_user_filled_custom),
                 colorFilter = ColorFilter.tint(LocalColors.current.textSecondary),
                 contentScale = ContentScale.Inside,
                 contentDescription = null,

app/src/main/res/drawable/ic_baseline_dashboard_24.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M3,13h8L11,3L3,3v10zM3,21h8v-6L3,15v6zM13,21h8L21,11h-8v10zM13,3v6h8L21,3h-8z"/>
-</vector>

app/src/main/res/drawable/ic_baseline_keyboard_arrow_down_24.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z"/>
-</vector>

app/src/main/res/drawable/ic_baseline_keyboard_arrow_up_24.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
-</vector>

app/src/main/res/drawable/ic_baseline_screen_rotation_alt_24.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,7.59l5,-5c0.78,-0.78 2.05,-0.78 2.83,0L20.24,11h-2.83L10.4,4L5.41,9H8v2H2V5h2V7.59zM20,19h2v-6h-6v2h2.59l-4.99,5l-7.01,-7H3.76l8.41,8.41c0.78,0.78 2.05,0.78 2.83,0l5,-5V19z"/>
-</vector>

app/src/main/res/drawable/ic_baseline_videocam_off_24.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M21,6.5l-4,4V7c0,-0.55 -0.45,-1 -1,-1H9.82L21,17.18V6.5zM3.27,2L2,3.27 4.73,6H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.21,0 0.39,-0.08 0.54,-0.18L19.73,21 21,19.73 3.27,2z"/>
-</vector>

app/src/main/res/drawable/ic_baseline_view_stream_24.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,18h17v-6H4v6zM4,5v6h17V5H4z"/>
-</vector>

app/src/main/res/drawable/ic_briefcase.xml

@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="50" android:viewportWidth="50" android:width="24dp">
+      
+    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M16.414,3.914C17.586,2.742 19.176,2.083 20.833,2.083H29.167C30.824,2.083 32.414,2.742 33.586,3.914C34.758,5.086 35.417,6.676 35.417,8.333V41.667C35.417,42.817 34.484,43.75 33.333,43.75C32.183,43.75 31.25,42.817 31.25,41.667V8.333C31.25,7.781 31.03,7.251 30.64,6.86C30.249,6.47 29.719,6.25 29.167,6.25H20.833C20.281,6.25 19.751,6.47 19.36,6.86C18.969,7.251 18.75,7.781 18.75,8.333V41.667C18.75,42.817 17.817,43.75 16.667,43.75C15.516,43.75 14.583,42.817 14.583,41.667V8.333C14.583,6.676 15.242,5.086 16.414,3.914Z"/>
+      
+    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M8.333,14.583C7.183,14.583 6.25,15.516 6.25,16.667V37.5C6.25,38.65 7.183,39.583 8.333,39.583H41.667C42.817,39.583 43.75,38.65 43.75,37.5V16.667C43.75,15.516 42.817,14.583 41.667,14.583H8.333ZM2.083,16.667C2.083,13.215 4.881,10.417 8.333,10.417H41.667C45.118,10.417 47.917,13.215 47.917,16.667V37.5C47.917,40.952 45.118,43.75 41.667,43.75H8.333C4.881,43.75 2.083,40.952 2.083,37.5V16.667Z"/>
+    
+</vector>

app/src/main/res/drawable/ic_brush.xml

@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="50" android:viewportWidth="50" android:width="24dp">
+      
+    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M41.413,8.565C40.94,8.371 40.433,8.273 39.922,8.277C39.41,8.281 38.905,8.387 38.435,8.588C37.965,8.79 37.54,9.082 37.184,9.45L37.16,9.474L20.347,26.266C19.533,27.079 18.214,27.078 17.401,26.264C16.588,25.45 16.589,24.131 17.403,23.318L34.204,6.537C34.942,5.779 35.822,5.174 36.795,4.758C37.773,4.339 38.825,4.119 39.889,4.111C40.952,4.102 42.007,4.305 42.992,4.709C43.977,5.112 44.871,5.707 45.624,6.46C46.376,7.212 46.971,8.107 47.375,9.091C47.778,10.076 47.981,11.131 47.973,12.195C47.964,13.259 47.744,14.311 47.325,15.289C46.909,16.261 46.305,17.141 45.547,17.879L28.767,34.7C27.954,35.515 26.635,35.517 25.82,34.704C25.006,33.891 25.004,32.572 25.817,31.758L42.608,14.925L42.634,14.899C43.001,14.544 43.294,14.118 43.495,13.648C43.696,13.178 43.802,12.673 43.806,12.162C43.81,11.651 43.713,11.144 43.519,10.67C43.325,10.197 43.039,9.767 42.678,9.406C42.316,9.044 41.886,8.758 41.413,8.565Z"/>
+      
+    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M6.396,37.415C6.397,32.799 10.107,29.042 14.729,29.042H14.736V29.042C15.833,29.045 16.919,29.265 17.931,29.688C18.943,30.111 19.862,30.73 20.635,31.508C21.408,32.286 22.021,33.209 22.437,34.224C22.853,35.238 23.066,36.324 23.062,37.42C23.062,37.421 23.062,37.422 23.062,37.423L20.979,37.417H23.062C23.062,37.418 23.062,37.419 23.062,37.42C23.061,43.222 18.392,47.917 12.646,47.917C8.677,47.917 5.235,45.537 2.831,43.089C2.833,43.092 2.836,43.095 2.839,43.098L4.312,41.625L2.826,43.084C2.827,43.086 2.829,43.088 2.831,43.089C2.613,42.87 2.348,42.531 2.2,42.06C2.037,41.542 2.064,41.01 2.238,40.538C2.527,39.752 3.154,39.326 3.372,39.182C3.672,38.983 4.009,38.815 4.267,38.69C4.415,38.619 4.532,38.564 4.643,38.511C4.782,38.446 4.913,38.384 5.087,38.299C5.644,38.026 6.024,37.795 6.256,37.577C6.351,37.488 6.386,37.432 6.396,37.415ZM6.396,37.415C6.396,37.415 6.396,37.416 6.396,37.417C6.396,37.418 6.396,37.418 6.396,37.417C6.397,37.415 6.398,37.411 6.398,37.411C6.397,37.412 6.397,37.413 6.396,37.415ZM14.726,33.208C12.433,33.21 10.562,35.076 10.562,37.417C10.562,38.851 9.86,39.909 9.107,40.616C8.613,41.079 8.05,41.439 7.545,41.717C9.188,42.972 10.946,43.75 12.646,43.75C16.065,43.75 18.896,40.946 18.896,37.417V37.41H18.896C18.898,36.86 18.791,36.315 18.582,35.806C18.374,35.297 18.067,34.835 17.679,34.444C17.292,34.054 16.831,33.744 16.324,33.532C15.817,33.32 15.274,33.21 14.726,33.208ZM5.676,42.653C5.68,42.651 5.685,42.647 5.691,42.644C5.649,42.677 5.637,42.679 5.676,42.653Z"/>
+    
+</vector>