diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfff87fae..8f62ae49e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
## UNRELEASED
+* Send contacts and email addresses
* Clickable email addresses
* Update Polish translation
* Fix tablet startup bug
diff --git a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/Theme.java b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/Theme.java
index dfaff4a3e..8a1750336 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/Theme.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/Theme.java
@@ -303,7 +303,7 @@ public class Theme {
attachButtonDrawables[ChatAttachAlert.ATTACH_BUTTON_IDX_MUSIC] = context.getResources().getDrawable(R.drawable.attach_audio_states);
attachButtonDrawables[ChatAttachAlert.ATTACH_BUTTON_IDX_FILE] = context.getResources().getDrawable(R.drawable.attach_file_states);
attachButtonDrawables[ChatAttachAlert.ATTACH_BUTTON_IDX_CONTACT] = context.getResources().getDrawable(R.drawable.attach_contact_states);
- attachButtonDrawables[ChatAttachAlert.ATTACH_BUTTON_IDX_LOCATION] = context.getResources().getDrawable(R.drawable.attach_location_states);
+ attachButtonDrawables[ChatAttachAlert.ATTACH_BUTTON_IDX_EMPTY] = context.getResources().getDrawable(R.drawable.attach_empty_states);
attachButtonDrawables[ChatAttachAlert.ATTACH_BUTTON_IDX_SENDSELECTED]= context.getResources().getDrawable(R.drawable.attach_hide_states);
}
}
diff --git a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
index 9103ad94d..d123387b7 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
@@ -1141,7 +1141,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
chatAttachAlert.setDelegate(new ChatAttachAlert.ChatAttachViewDelegate() {
@Override
public void didPressedButton(int button) {
- if (getParentActivity() == null) {
+ if (getParentActivity() == null || button == ChatAttachAlert.ATTACH_BUTTON_IDX_EMPTY) {
return;
}
if (button == ChatAttachAlert.ATTACH_BUTTON_IDX_SENDSELECTED) {
@@ -1276,8 +1276,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} catch (Exception e) {
FileLog.e("messenger", e);
}
- } else if (which == ChatAttachAlert.ATTACH_BUTTON_IDX_LOCATION ) {
- Toast.makeText(getParentActivity(), LocaleController.getString("NotYetImplemented", R.string.NotYetImplemented), Toast.LENGTH_SHORT).show();
} else if (which == ChatAttachAlert.ATTACH_BUTTON_IDX_FILE ) {
Toast.makeText(getParentActivity(), LocaleController.getString("NotYetImplemented", R.string.NotYetImplemented), Toast.LENGTH_SHORT).show();
if (Build.VERSION.SDK_INT >= 23 && getParentActivity().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAttachAlert.java b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAttachAlert.java
index 6b0223e33..542db28be 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAttachAlert.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAttachAlert.java
@@ -82,9 +82,9 @@ public class ChatAttachAlert extends BottomSheet implements NotificationCenter.N
public final static int ATTACH_BUTTON_IDX_CAMERA = 0;
public final static int ATTACH_BUTTON_IDX_VIDEO = 1;
- public final static int ATTACH_BUTTON_IDX_LOCATION = 2;
- public final static int ATTACH_BUTTON_IDX_CONTACT = 3;
- public final static int ATTACH_BUTTON_IDX_GALLERY = 4;
+ public final static int ATTACH_BUTTON_IDX_GALLERY = 2;
+ public final static int ATTACH_BUTTON_IDX_EMPTY = 3;
+ public final static int ATTACH_BUTTON_IDX_CONTACT = 4;
public final static int ATTACH_BUTTON_IDX_FILE = 5;
public final static int ATTACH_BUTTON_IDX_MUSIC = 6;
public final static int ATTACH_BUTTON_IDX_SENDSELECTED = 7;
@@ -425,7 +425,7 @@ public class ChatAttachAlert extends BottomSheet implements NotificationCenter.N
labels[ATTACH_BUTTON_IDX_MUSIC] = LocaleController.getString("AttachMusic", R.string.AttachMusic);
labels[ATTACH_BUTTON_IDX_FILE] = LocaleController.getString("ChatDocument", R.string.ChatDocument);
labels[ATTACH_BUTTON_IDX_CONTACT] = LocaleController.getString("AttachContact", R.string.AttachContact);
- labels[ATTACH_BUTTON_IDX_LOCATION] = LocaleController.getString("ChatLocation", R.string.ChatLocation);
+ labels[ATTACH_BUTTON_IDX_EMPTY] = "";
labels[ATTACH_BUTTON_IDX_SENDSELECTED]= "";
for (int a = 0; a < ATTACH_BUTTON_COUNT; a++) {
diff --git a/MessengerProj/src/main/res/drawable-hdpi/attach_contact.png b/MessengerProj/src/main/res/drawable-hdpi/attach_contact.png
index 147f8b75e..a2d66dd81 100755
Binary files a/MessengerProj/src/main/res/drawable-hdpi/attach_contact.png and b/MessengerProj/src/main/res/drawable-hdpi/attach_contact.png differ
diff --git a/MessengerProj/src/main/res/drawable-hdpi/attach_contact_pressed.png b/MessengerProj/src/main/res/drawable-hdpi/attach_contact_pressed.png
index 8c38efd61..91886e4ed 100755
Binary files a/MessengerProj/src/main/res/drawable-hdpi/attach_contact_pressed.png and b/MessengerProj/src/main/res/drawable-hdpi/attach_contact_pressed.png differ
diff --git a/MessengerProj/src/main/res/drawable-hdpi/attach_location.png b/MessengerProj/src/main/res/drawable-hdpi/attach_location.png
deleted file mode 100755
index 8e76cff4f..000000000
Binary files a/MessengerProj/src/main/res/drawable-hdpi/attach_location.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-hdpi/attach_location_pressed.png b/MessengerProj/src/main/res/drawable-hdpi/attach_location_pressed.png
deleted file mode 100755
index bc2f11844..000000000
Binary files a/MessengerProj/src/main/res/drawable-hdpi/attach_location_pressed.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-hdpi/pin.png b/MessengerProj/src/main/res/drawable-hdpi/pin.png
deleted file mode 100644
index 386acb228..000000000
Binary files a/MessengerProj/src/main/res/drawable-hdpi/pin.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-mdpi/attach_contact.png b/MessengerProj/src/main/res/drawable-mdpi/attach_contact.png
index 6d32ff13c..6e6180ea8 100755
Binary files a/MessengerProj/src/main/res/drawable-mdpi/attach_contact.png and b/MessengerProj/src/main/res/drawable-mdpi/attach_contact.png differ
diff --git a/MessengerProj/src/main/res/drawable-mdpi/attach_contact_pressed.png b/MessengerProj/src/main/res/drawable-mdpi/attach_contact_pressed.png
index 0546d8d70..502d6fab6 100755
Binary files a/MessengerProj/src/main/res/drawable-mdpi/attach_contact_pressed.png and b/MessengerProj/src/main/res/drawable-mdpi/attach_contact_pressed.png differ
diff --git a/MessengerProj/src/main/res/drawable-mdpi/attach_location.png b/MessengerProj/src/main/res/drawable-mdpi/attach_location.png
deleted file mode 100755
index cc02b3201..000000000
Binary files a/MessengerProj/src/main/res/drawable-mdpi/attach_location.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-mdpi/attach_location_pressed.png b/MessengerProj/src/main/res/drawable-mdpi/attach_location_pressed.png
deleted file mode 100755
index 1c3917fe0..000000000
Binary files a/MessengerProj/src/main/res/drawable-mdpi/attach_location_pressed.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-mdpi/pin.png b/MessengerProj/src/main/res/drawable-mdpi/pin.png
deleted file mode 100644
index ce126ca8c..000000000
Binary files a/MessengerProj/src/main/res/drawable-mdpi/pin.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-xhdpi/attach_contact.png b/MessengerProj/src/main/res/drawable-xhdpi/attach_contact.png
index b81f418de..07de834b0 100755
Binary files a/MessengerProj/src/main/res/drawable-xhdpi/attach_contact.png and b/MessengerProj/src/main/res/drawable-xhdpi/attach_contact.png differ
diff --git a/MessengerProj/src/main/res/drawable-xhdpi/attach_contact_pressed.png b/MessengerProj/src/main/res/drawable-xhdpi/attach_contact_pressed.png
index bada4c266..c6925a2e3 100755
Binary files a/MessengerProj/src/main/res/drawable-xhdpi/attach_contact_pressed.png and b/MessengerProj/src/main/res/drawable-xhdpi/attach_contact_pressed.png differ
diff --git a/MessengerProj/src/main/res/drawable-xhdpi/attach_empty.png b/MessengerProj/src/main/res/drawable-xhdpi/attach_empty.png
new file mode 100755
index 000000000..71fe97842
Binary files /dev/null and b/MessengerProj/src/main/res/drawable-xhdpi/attach_empty.png differ
diff --git a/MessengerProj/src/main/res/drawable-xhdpi/attach_location.png b/MessengerProj/src/main/res/drawable-xhdpi/attach_location.png
deleted file mode 100755
index 0294c218f..000000000
Binary files a/MessengerProj/src/main/res/drawable-xhdpi/attach_location.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-xhdpi/attach_location_pressed.png b/MessengerProj/src/main/res/drawable-xhdpi/attach_location_pressed.png
deleted file mode 100755
index 50e92b498..000000000
Binary files a/MessengerProj/src/main/res/drawable-xhdpi/attach_location_pressed.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-xhdpi/pin.png b/MessengerProj/src/main/res/drawable-xhdpi/pin.png
deleted file mode 100644
index 1fa36f892..000000000
Binary files a/MessengerProj/src/main/res/drawable-xhdpi/pin.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/attach_contact.png b/MessengerProj/src/main/res/drawable-xxhdpi/attach_contact.png
index 71f9be5bc..9de7dd7be 100755
Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/attach_contact.png and b/MessengerProj/src/main/res/drawable-xxhdpi/attach_contact.png differ
diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/attach_contact_pressed.png b/MessengerProj/src/main/res/drawable-xxhdpi/attach_contact_pressed.png
index d8824727d..0f4fab1e0 100755
Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/attach_contact_pressed.png and b/MessengerProj/src/main/res/drawable-xxhdpi/attach_contact_pressed.png differ
diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/attach_location.png b/MessengerProj/src/main/res/drawable-xxhdpi/attach_location.png
deleted file mode 100755
index 13ba2eaa7..000000000
Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/attach_location.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/attach_location_pressed.png b/MessengerProj/src/main/res/drawable-xxhdpi/attach_location_pressed.png
deleted file mode 100755
index cfa436dd1..000000000
Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/attach_location_pressed.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/pin.png b/MessengerProj/src/main/res/drawable-xxhdpi/pin.png
deleted file mode 100644
index 8580d9a2f..000000000
Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/pin.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable/attach_empty_states.xml b/MessengerProj/src/main/res/drawable/attach_empty_states.xml
new file mode 100644
index 000000000..ab1d113fc
--- /dev/null
+++ b/MessengerProj/src/main/res/drawable/attach_empty_states.xml
@@ -0,0 +1,6 @@
+
+
+