Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Do not use message field to display file name for the day we'll be able to send both file and text

Browse source
This commit is contained in:
Sylvain Berfini 2017-11-01 17:18:51 +01:00
parent 83fffb16d2
commit cf127fee22
4 changed files with 45 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
res/layout/chat_bubble.xml
View file

@ -109,55 +109,50 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextView
android:id="@+id/message"
style="@style/font11"
android:autoLink="web"
android:linksClickable="true"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:gravity="center"
android:layout_gravity="center">
<RelativeLayout <TextView
android:id="@+id/relativeLayoutCentered" android:id="@+id/file_name"
android:layout_width="wrap_content" style="@style/font11"
android:layout_height="wrap_content" android:visibility="gone"
android:gravity="center" android:layout_width="wrap_content"
android:layout_gravity="center"> android:layout_height="wrap_content" />
<ImageView <ImageView
android:id="@+id/image" android:id="@+id/image"
android:visibility="gone" android:visibility="gone"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scaleType="centerInside" android:layout_below="@id/file_name"
android:layout_marginTop="12dp" android:layout_centerHorizontal="true"
android:layout_marginBottom="12dp"/> android:scaleType="centerInside"/>
<TextView <TextView
android:id="@+id/open_file" android:id="@+id/open_file"
android:gravity="center" android:gravity="center"
android:textAlignment="center" android:layout_centerVertical="true"
android:layout_centerHorizontal="true" android:layout_below="@id/file_name"
android:layout_centerVertical="true" android:layout_centerHorizontal="true"
android:background="@color/colorA" android:background="@color/colorA"
android:padding="5dp" android:padding="5dp"
android:maxLines="1" style="@style/font25"
style="@style/font25" android:layout_width="150dp"
android:layout_width="150dp" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:text="@string/open"/>
android:text="@string/open"/>
</RelativeLayout>
</RelativeLayout> </RelativeLayout>
<TextView
android:id="@+id/message"
style="@style/font11"
android:autoLink="web"
android:linksClickable="true"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<RelativeLayout <RelativeLayout
android:id="@+id/file_transfer_layout" android:id="@+id/file_transfer_layout"
android:visibility="gone" android:visibility="gone"

4
src/android/org/linphone/chat/ChatBubbleViewHolder.java
View file

@ -55,6 +55,8 @@ public class ChatBubbleViewHolder {
public RelativeLayout fileTransferLayout; public RelativeLayout fileTransferLayout;
public ProgressBar fileTransferProgressBar; public ProgressBar fileTransferProgressBar;
public Button fileTransferAction; public Button fileTransferAction;
public TextView fileName;
public TextView openFileButton; public TextView openFileButton;
public CheckBox delete; public CheckBox delete;
@ -82,6 +84,8 @@ public class ChatBubbleViewHolder {
fileTransferLayout = view.findViewById(R.id.file_transfer_layout); fileTransferLayout = view.findViewById(R.id.file_transfer_layout);
fileTransferProgressBar = view.findViewById(R.id.progress_bar); fileTransferProgressBar = view.findViewById(R.id.progress_bar);
fileTransferAction = view.findViewById(R.id.file_transfer_action); fileTransferAction = view.findViewById(R.id.file_transfer_action);
fileName = view.findViewById(R.id.file_name);
openFileButton = view.findViewById(R.id.open_file); openFileButton = view.findViewById(R.id.open_file);
delete = view.findViewById(R.id.delete_message); delete = view.findViewById(R.id.delete_message);

11
src/android/org/linphone/chat/ChatEventsAdapter.java
View file

@ -68,9 +68,7 @@ import java.io.IOException;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Calendar;
import java.util.List; import java.util.List;
import java.util.regex.Pattern;
import static android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION; import static android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION;
@ -138,6 +136,7 @@ public class ChatEventsAdapter extends BaseAdapter implements ChatMessageListene
holder.fileTransferLayout.setVisibility(View.GONE); holder.fileTransferLayout.setVisibility(View.GONE);
holder.fileTransferProgressBar.setProgress(0); holder.fileTransferProgressBar.setProgress(0);
holder.fileTransferAction.setEnabled(true); holder.fileTransferAction.setEnabled(true);
holder.fileName.setVisibility(View.GONE);
holder.openFileButton.setVisibility(View.GONE); holder.openFileButton.setVisibility(View.GONE);
holder.messageStatus.setVisibility(View.INVISIBLE); holder.messageStatus.setVisibility(View.INVISIBLE);
holder.messageSendingInProgress.setVisibility(View.GONE); holder.messageSendingInProgress.setVisibility(View.GONE);
@ -250,13 +249,13 @@ public class ChatEventsAdapter extends BaseAdapter implements ChatMessageListene
String appData = message.getAppdata(); String appData = message.getAppdata();
if (externalBodyUrl != null) { // Incoming file transfer if (externalBodyUrl != null) { // Incoming file transfer
if (appData != null) { // Download already done, just display the result if (appData != null) { // Download already done, just display the result
holder.messageText.setVisibility(View.VISIBLE); holder.fileName.setVisibility(View.VISIBLE);
holder.messageText.setText(fileTransferContent.getName()); holder.fileName.setText(fileTransferContent.getName());
displayDownloadedFile(message, holder); displayDownloadedFile(message, holder);
} else { // Attachment not yet downloaded } else { // Attachment not yet downloaded
holder.messageText.setVisibility(View.VISIBLE); holder.fileName.setVisibility(View.VISIBLE);
holder.messageText.setText(fileTransferContent.getName()); holder.fileName.setText(fileTransferContent.getName());
holder.fileTransferLayout.setVisibility(View.VISIBLE); holder.fileTransferLayout.setVisibility(View.VISIBLE);
holder.fileTransferProgressBar.setVisibility(View.GONE); holder.fileTransferProgressBar.setVisibility(View.GONE);

2
src/android/org/linphone/chat/GroupChatFragment.java
View file

@ -57,9 +57,7 @@ import org.linphone.contacts.ContactAddress;
import org.linphone.contacts.ContactsManager; import org.linphone.contacts.ContactsManager;
import org.linphone.contacts.LinphoneContact; import org.linphone.contacts.LinphoneContact;
import org.linphone.core.Address; import org.linphone.core.Address;
import org.linphone.core.Buffer;
import org.linphone.core.ChatMessage; import org.linphone.core.ChatMessage;
import org.linphone.core.ChatMessageListener;
import org.linphone.core.ChatMessageListenerStub; import org.linphone.core.ChatMessageListenerStub;
import org.linphone.core.ChatRoom; import org.linphone.core.ChatRoom;
import org.linphone.core.ChatRoomListener; import org.linphone.core.ChatRoomListener;