awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Do not hide the default-send-key if send-by-enter is enables (looks like a bug).

Browse Source
This commit is contained in:
B. Petersen
2017-03-02 16:43:37 +01:00
parent 082f7229f2
commit 129e6ad487
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java
+9 -15
View File
@@ -1018,12 +1018,10 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
}
runningAnimationType = 1;
if( !sendByEnter ) {
animators.add(ObjectAnimator.ofFloat(sendButton, "scaleX", 1.0f));
animators.add(ObjectAnimator.ofFloat(sendButton, "scaleY", 1.0f));
animators.add(ObjectAnimator.ofFloat(sendButton, "alpha", 1.0f));
sendButton.setVisibility(VISIBLE);
}
animators.add(ObjectAnimator.ofFloat(sendButton, "scaleX", 1.0f));
animators.add(ObjectAnimator.ofFloat(sendButton, "scaleY", 1.0f));
animators.add(ObjectAnimator.ofFloat(sendButton, "alpha", 1.0f));
sendButton.setVisibility(VISIBLE);
runningAnimation.playTogether(animators);
runningAnimation.setDuration(150);
@@ -1032,9 +1030,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
public void onAnimationEnd(Animator animation) {
if (runningAnimation != null && runningAnimation.equals(animation)) {
if( !sendByEnter ) {
sendButton.setVisibility(VISIBLE);
}
sendButton.setVisibility(VISIBLE);
audioRecordButton.setVisibility(GONE);
runningAnimation = null;
@@ -1055,12 +1051,10 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
audioRecordButton.setScaleY(0.1f);
audioRecordButton.setAlpha(0.0f);
if( !sendByEnter ) {
sendButton.setScaleX(1.0f);
sendButton.setScaleY(1.0f);
sendButton.setAlpha(1.0f);
sendButton.setVisibility(VISIBLE);
}
sendButton.setScaleX(1.0f);
sendButton.setScaleY(1.0f);
sendButton.setAlpha(1.0f);
sendButton.setVisibility(VISIBLE);
audioRecordButton.setVisibility(GONE);
if (attachButton != null) {
MessengerProj/src/main/java/com/b44t/ui/SettingsActivity.java
+2 -2
View File
@@ -119,8 +119,8 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
privacyRow = rowCount++;
notificationRow = rowCount++;
backgroundRow = rowCount++;
messagesSectionRow = -1; // rowCount++;
messagesSectionRow2 = -1; // rowCount++;
messagesSectionRow = rowCount++;
messagesSectionRow2 = rowCount++;
if (Build.VERSION.SDK_INT >= 23) {
directShareRow = -1; // for now, seems not really to work, however, in T'gram it does
}