ownSoft/Chat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Recording audio file is now supported.

Browse Source
This commit is contained in:
Lyndon
2017-11-27 19:37:31 +01:00
parent 8476d42568
commit 2ac54f2323
5 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatActivity.java
View File

@@ -348,8 +348,12 @@ abstract class BaseChatActivity extends RuntimePermissionActivity implements Cha
private int xDelta;
private String mAudioFilePath;
private int mMaxMarginRight;
private Rect mDialogContainer;
private int mStartMarginLeft = 0;
private int mInitialMarginX = 0;
private int mInitialLeft = 0;
private int mInitialMarginLeft = 0;
private void selectFile(int requestCode) {
final String[] zipFileTypes = {".zip", ".rar", ".7z"};
final String[] pdfFileTypes = {".pdf"};
@@ -395,13 +399,6 @@ abstract class BaseChatActivity extends RuntimePermissionActivity implements Cha
dialog.dismiss();
});
dialog.setOnShowListener(dialog1 -> {
mMaxMarginRight = ((GridLayout.LayoutParams) attachRecordAudioImageView.getLayoutParams()).leftMargin;
mDialogContainer = ViewUtils.getRectFromView(dialog.findViewById(R.id.dialogGridLayout));
});
Log.d("ON_TOUCH", "Upload max size: " + mUploadMaxSize.get());
final long duration = ((mUploadMaxSize.get() / 10 * 9) * 8) / (Constants.RECORDING_BIT_RATE_IN_MS / 1000); // 10% Overhead
CountDownTimer countDownTimer = new CountDownTimer(duration, 10) {
@Override
@@ -440,6 +437,20 @@ abstract class BaseChatActivity extends RuntimePermissionActivity implements Cha
GridLayout.LayoutParams layoutParams1 = (GridLayout.LayoutParams) v.getLayoutParams();
xDelta = x - layoutParams1.leftMargin;
Log.d("ON_TOUCH", "starting value of left margin: " + layoutParams1.leftMargin);
mInitialMarginLeft = ((GridLayout.LayoutParams) attachRecordAudioImageView.getLayoutParams()).leftMargin;
mDialogContainer = ViewUtils.getRectFromView(dialog.findViewById(R.id.dialogGridLayout));
mInitialLeft = ViewUtils.getRectFromView(attachRecordAudioImageView).left;
mInitialMarginX = mInitialLeft - mInitialMarginLeft;
Log.d("ON_TOUCH", "initial left x value from audio recording button: " + mInitialMarginX + "; initial left: " + mInitialLeft);
Log.d("ON_TOUCH", "xDelta: " + xDelta);
attachRecordAudioImageView.setImageResource(R.mipmap.ic_file_dialog_record_audio_pressed);
limitTextView.setVisibility(View.VISIBLE);
attachDocumentImageView.setVisibility(View.INVISIBLE);
@@ -509,10 +520,9 @@ abstract class BaseChatActivity extends RuntimePermissionActivity implements Cha
int newLeft = x - xDelta;
int buttonLeft = ViewUtils.getRectFromView(attachRecordAudioImageView).left;
int nextX = mInitialLeft + newLeft - (mInitialMarginLeft * 2);
boolean isMovingToRight = layoutParams2.leftMargin > newLeft;
boolean isMovingWithinBounds = buttonLeft > mDialogContainer.left && newLeft < mMaxMarginRight;
boolean isMovingWithinBounds = nextX >= mDialogContainer.left && newLeft < mInitialMarginLeft;
if(isMovingWithinBounds) {
layoutParams2.leftMargin = newLeft;
@@ -520,10 +530,6 @@ abstract class BaseChatActivity extends RuntimePermissionActivity implements Cha
v.setLayoutParams(layoutParams2);
dialog.findViewById(R.id.dialogGridLayout).invalidate();
Log.d("ON_TOUCH", "button left: " + buttonLeft + "; newLeft: " + newLeft);
} else {
Log.d("ON_TOUCH", "not moving within bounds: buttonLeft: " + buttonLeft + "; left border: " + mDialogContainer.left);
}
return true;

4
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_group_chat_left.xml
View File

@@ -46,8 +46,8 @@
<ImageView
android:id="@+id/chat_item_file"
android:layout_width="wrap_content"
android:layout_height="120dp"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@id/chat_item_time"

4
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_group_chat_right.xml
View File

@@ -92,8 +92,8 @@
<ImageView
android:id="@+id/chat_item_file"
android:layout_width="wrap_content"
android:layout_height="120dp"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@id/chat_item_time"

4
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_left.xml
View File

@@ -27,8 +27,8 @@
<ImageView
android:id="@+id/chat_item_file"
android:layout_width="250dp"
android:layout_height="250dp"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_below="@id/chat_item_time"
android:layout_marginTop="4dp"
android:adjustViewBounds="true"

4
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml
View File

@@ -70,8 +70,8 @@
<ImageView
android:id="@+id/chat_item_file"
android:layout_width="250dp"
android:layout_height="250dp"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_alignParentStart="true"
android:layout_below="@id/chat_item_time"
android:layout_marginTop="4dp"