diff --git a/MessengerProj/src/main/AndroidManifest.xml b/MessengerProj/src/main/AndroidManifest.xml index 2db014396..4b4a0f28b 100644 --- a/MessengerProj/src/main/AndroidManifest.xml +++ b/MessengerProj/src/main/AndroidManifest.xml @@ -131,15 +131,6 @@ android:configChanges="keyboard|keyboardHidden|orientation|screenSize" android:exported="true"> - - = buttonX && x <= buttonX + side && y >= buttonY && y <= buttonY + side) { - buttonPressed = 1; - invalidate(); - result = true; - } - } else if (buttonPressed == 1) { - if (event.getAction() == MotionEvent.ACTION_UP) { - buttonPressed = 0; - playSoundEffect(SoundEffectConstants.CLICK); - didPressedButton(); - invalidate(); - } else if (event.getAction() == MotionEvent.ACTION_CANCEL) { - buttonPressed = 0; - invalidate(); - } else if (event.getAction() == MotionEvent.ACTION_MOVE) { - if (!(x >= buttonX && x <= buttonX + side && y >= buttonY && y <= buttonY + side)) { - buttonPressed = 0; - invalidate(); - } - } - } - if (!result) { - result = super.onTouchEvent(event); - } - } - - return result; - } - - private void didPressedButton() { - if (buttonState == 0) { - boolean result = MediaController.getInstance().playAudio(currentMessageObject); - if (!currentMessageObject.isOut() && currentMessageObject.isContentUnread()) { - if (currentMessageObject.messageOwner.to_id.channel_id == 0) { - MessagesController.getInstance().markMessageContentAsRead(currentMessageObject); - currentMessageObject.setContentIsRead(); - } - } - if (result) { - buttonState = 1; - invalidate(); - } - } else if (buttonState == 1) { - boolean result = MediaController.getInstance().pauseAudio(currentMessageObject); - if (result) { - buttonState = 0; - invalidate(); - } - } else if (buttonState == 2) { - FileLoader.getInstance().loadFile(currentMessageObject.getDocument(), true, false); - buttonState = 3; - invalidate(); - } else if (buttonState == 3) { - FileLoader.getInstance().cancelLoadFile(currentMessageObject.getDocument()); - buttonState = 2; - invalidate(); - } - } - - public void updateProgress() { - if (currentMessageObject == null) { - return; - } - - if (!seekBar.isDragging()) { - seekBar.setProgress(currentMessageObject.audioProgress); - } - - int duration = 0; - if (!MediaController.getInstance().isPlayingAudio(currentMessageObject)) { - for (int a = 0; a < currentMessageObject.getDocument().attributes.size(); a++) { - TLRPC.DocumentAttribute attribute = currentMessageObject.getDocument().attributes.get(a); - if (attribute instanceof TLRPC.TL_documentAttributeAudio) { - duration = attribute.duration; - break; - } - } - } else { - duration = currentMessageObject.audioProgressSec; - } - String timeString = String.format("%02d:%02d", duration / 60, duration % 60); - if (lastTimeString == null || lastTimeString != null && !lastTimeString.equals(timeString)) { - timeWidth = (int)Math.ceil(timePaint.measureText(timeString)); - timeLayout = new StaticLayout(timeString, timePaint, timeWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false); - } - invalidate(); - } - - public void downloadAudioIfNeed() { - if (buttonState == 2) { - FileLoader.getInstance().loadFile(currentMessageObject.getDocument(), true, false); - buttonState = 3; - invalidate(); - } - } - - public void updateButtonState() { - String fileName = currentMessageObject.getFileName(); - File cacheFile = FileLoader.getPathToMessage(currentMessageObject.messageOwner); - if (cacheFile.exists()) { - MediaController.getInstance().removeLoadingFileObserver(this); - boolean playing = MediaController.getInstance().isPlayingAudio(currentMessageObject); - if (!playing || playing && MediaController.getInstance().isAudioPaused()) { - buttonState = 0; - } else { - buttonState = 1; - } - progressView.setProgress(0); - } else { - MediaController.getInstance().addLoadingFileObserver(fileName, this); - if (!FileLoader.getInstance().isLoadingFile(fileName)) { - buttonState = 2; - progressView.setProgress(0); - } else { - buttonState = 3; - Float progress = ImageLoader.getInstance().getFileProgress(fileName); - if (progress != null) { - progressView.setProgress(progress); - } else { - progressView.setProgress(0); - } - } - } - updateProgress(); - } - - @Override - public void onFailedDownload(String fileName) { - updateButtonState(); - } - - @Override - public void onSuccessDownload(String fileName) { - updateButtonState(); - } - - @Override - public void onProgressDownload(String fileName, float progress) { - progressView.setProgress(progress); - if (buttonState != 3) { - updateButtonState(); - } - invalidate(); - } - - @Override - public void onProgressUpload(String fileName, float progress, boolean isEncrypted) { - - } - - @Override - public int getObserverTag() { - return TAG; - } - - @Override - public void onSeekBarDrag(float progress) { - if (currentMessageObject == null) { - return; - } - currentMessageObject.audioProgress = progress; - MediaController.getInstance().seekToProgress(currentMessageObject, progress); - } -} diff --git a/MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java index d963b5e14..1c3e8b51b 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java @@ -26,7 +26,6 @@ import android.widget.AdapterView; import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.ListView; -import android.widget.Toast; import com.b44t.messenger.LocaleController; import com.b44t.messenger.NotificationsController; @@ -59,7 +58,6 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif private int messageVibrateRow; private int messageSoundRow; private int messageLedRow; - private int messagePopupNotificationRow; private int messagePriorityRow; private int groupSectionRow2; private int groupSectionRow; @@ -68,7 +66,6 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif private int groupVibrateRow; private int groupSoundRow; private int groupLedRow; - private int groupPopupNotificationRow; private int groupPriorityRow; private int inappSectionRow2; private int inappSectionRow; @@ -86,6 +83,13 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif private int resetNotificationsRow; private int rowCount = 0; + private final int TYPE_HEADER = 0; + private final int TYPE_CHECK_CELL = 1; + private final int TYPE_TEXT_DETAIL = 2; + private final int TYPE_COLOR_CELL = 3; + private final int TYPE_SHADOW = 4; + private final int TYPE_COUNT = 5; + @Override public boolean onFragmentCreate() { messageSectionRow = rowCount++; @@ -93,7 +97,6 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif messagePreviewRow = rowCount++; messageLedRow = rowCount++; messageVibrateRow = rowCount++; - messagePopupNotificationRow = rowCount++; messageSoundRow = rowCount++; if (Build.VERSION.SDK_INT >= 21) { messagePriorityRow = rowCount++; @@ -106,7 +109,6 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif groupPreviewRow = rowCount++; groupLedRow = rowCount++; groupVibrateRow = rowCount++; - groupPopupNotificationRow = rowCount++; groupSoundRow = rowCount++; if (Build.VERSION.SDK_INT >= 21) { groupPriorityRow = rowCount++; @@ -377,32 +379,6 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif } }); showDialog(builder.create()); - } else if (i == messagePopupNotificationRow || i == groupPopupNotificationRow) { - AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); - builder.setTitle(LocaleController.getString("PopupNotification", R.string.PopupNotification)); - builder.setItems(new CharSequence[]{ - LocaleController.getString("NoPopup", R.string.NoPopup), - LocaleController.getString("OnlyWhenScreenOn", R.string.OnlyWhenScreenOn), - LocaleController.getString("OnlyWhenScreenOff", R.string.OnlyWhenScreenOff), - LocaleController.getString("AlwaysShowPopup", R.string.AlwaysShowPopup) - }, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); - SharedPreferences.Editor editor = preferences.edit(); - if (i == messagePopupNotificationRow) { - editor.putInt("popupAll", which); - } else if (i == groupPopupNotificationRow) { - editor.putInt("popupGroup", which); - } - editor.commit(); - if (listView != null) { - listView.invalidateViews(); - } - } - }); - builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null); - showDialog(builder.create()); } else if (i == messageVibrateRow || i == groupVibrateRow) { AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); builder.setTitle(LocaleController.getString("Vibrate", R.string.Vibrate)); @@ -602,7 +578,7 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif @Override public View getView(int i, View view, ViewGroup viewGroup) { int type = getItemViewType(i); - if (type == 0) { + if (type == TYPE_HEADER) { if (view == null) { view = new HeaderCell(mContext); } @@ -617,7 +593,7 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif } else if (i == resetSectionRow) { ((HeaderCell) view).setText(LocaleController.getString("Reset", R.string.Reset)); } - } if (type == 1) { + } if (type == TYPE_CHECK_CELL) { if (view == null) { view = new TextCheckCell(mContext); } @@ -649,7 +625,7 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif } else if (i == inchatSoundRow) { checkCell.setTextAndCheck(LocaleController.getString("InChatSound", R.string.InChatSound), preferences.getBoolean("EnableInChatSound", true), true); } - } else if (type == 2) { + } else if (type == TYPE_TEXT_DETAIL) { if (view == null) { view = new TextDetailSettingsCell(mContext); } @@ -673,25 +649,6 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif } else if (i == resetNotificationsRow) { textCell.setMultilineDetail(true); textCell.setTextAndValue(LocaleController.getString("ResetAllNotifications", R.string.ResetAllNotifications), LocaleController.getString("UndoAllCustom", R.string.UndoAllCustom), false); - } else if (i == messagePopupNotificationRow || i == groupPopupNotificationRow) { - textCell.setMultilineDetail(false); - int option = 0; - if (i == messagePopupNotificationRow) { - option = preferences.getInt("popupAll", 0); - } else if (i == groupPopupNotificationRow) { - option = preferences.getInt("popupGroup", 0); - } - String value; - if (option == 0) { - value = LocaleController.getString("NoPopup", R.string.NoPopup); - } else if (option == 1) { - value = LocaleController.getString("OnlyWhenScreenOn", R.string.OnlyWhenScreenOn); - } else if (option == 2) { - value = LocaleController.getString("OnlyWhenScreenOff", R.string.OnlyWhenScreenOff); - } else { - value = LocaleController.getString("AlwaysShowPopup", R.string.AlwaysShowPopup); - } - textCell.setTextAndValue(LocaleController.getString("PopupNotification", R.string.PopupNotification), value, true); } else if (i == messageVibrateRow || i == groupVibrateRow) { textCell.setMultilineDetail(false); int value = 0; @@ -739,7 +696,7 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif textCell.setTextAndValue(LocaleController.getString("NotificationsPriority", R.string.NotificationsPriority), LocaleController.getString("NotificationsPriorityMax", R.string.NotificationsPriorityMax), false); } } - } else if (type == 3) { + } else if (type == TYPE_COLOR_CELL) { if (view == null) { view = new TextColorCell(mContext); } @@ -752,7 +709,7 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif } else if (i == groupLedRow) { textCell.setTextAndColor(LocaleController.getString("LedColor", R.string.LedColor), preferences.getInt("GroupLed", 0xff00ff00), true); } - } else if (type == 4) { + } else if (type == TYPE_SHADOW) { if (view == null) { view = new ShadowSectionCell(mContext); } @@ -764,26 +721,26 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif public int getItemViewType(int i) { if (i == messageSectionRow || i == groupSectionRow || i == inappSectionRow || i == otherSectionRow || i == resetSectionRow) { - return 0; + return TYPE_HEADER; } else if (i == messageAlertRow || i == messagePreviewRow || i == groupAlertRow || i == groupPreviewRow || i == inappSoundRow || i == inappVibrateRow || i == inappPreviewRow || i == notificationsServiceRow || i == badgeNumberRow || i == inappPriorityRow || i == inchatSoundRow || i == notificationsServiceConnectionRow) { - return 1; + return TYPE_CHECK_CELL; } else if (i == messageLedRow || i == groupLedRow) { - return 3; + return TYPE_COLOR_CELL; } else if ( i == groupSectionRow2 || i == inappSectionRow2 || i == otherSectionRow2 || i == resetSectionRow2) { - return 4; + return TYPE_SHADOW; } else { - return 2; + return TYPE_TEXT_DETAIL; } } @Override public int getViewTypeCount() { - return 5; + return TYPE_COUNT; } @Override diff --git a/MessengerProj/src/main/java/com/b44t/ui/PopupNotificationActivity.java b/MessengerProj/src/main/java/com/b44t/ui/PopupNotificationActivity.java deleted file mode 100644 index 490410d80..000000000 --- a/MessengerProj/src/main/java/com/b44t/ui/PopupNotificationActivity.java +++ /dev/null @@ -1,1255 +0,0 @@ -/* - * This is the source code of Telegram for Android v. 3.x.x. - * It is licensed under GNU GPL v. 2 or later. - * You should have received a copy of the license in this archive (see LICENSE). - * - * Copyright Nikolai Kudashov, 2013-2016. - */ - -package com.b44t.ui; - -import android.annotation.TargetApi; -import android.app.Activity; -import android.app.AlertDialog; -import android.app.KeyguardManager; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.pm.PackageManager; -import android.content.res.Configuration; -import android.graphics.drawable.Drawable; -import android.net.Uri; -import android.os.Build; -import android.os.Bundle; -import android.os.PowerManager; -import android.text.TextUtils; -import android.util.AttributeSet; -import android.util.TypedValue; -import android.view.Gravity; -import android.view.MotionEvent; -import android.view.VelocityTracker; -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewTreeObserver; -import android.view.WindowManager; -import android.view.animation.TranslateAnimation; -import android.widget.FrameLayout; -import android.widget.RelativeLayout; -import android.widget.TextView; - -import com.b44t.messenger.AndroidUtilities; -import com.b44t.messenger.LocaleController; -import com.b44t.messenger.MediaController; -import com.b44t.messenger.MessagesController; -import com.b44t.messenger.MrMailbox; -import com.b44t.messenger.NotificationsController; -import com.b44t.messenger.UserObject; -import com.b44t.messenger.ApplicationLoader; -import com.b44t.messenger.FileLoader; -import com.b44t.messenger.FileLog; -import com.b44t.messenger.NotificationCenter; -import com.b44t.messenger.R; -import com.b44t.messenger.ConnectionsManager; -import com.b44t.messenger.TLRPC; -import com.b44t.messenger.MessageObject; -import com.b44t.ui.ActionBar.ActionBar; -import com.b44t.ui.ActionBar.ActionBarMenu; -import com.b44t.ui.Components.AvatarDrawable; -import com.b44t.ui.Components.BackupImageView; -import com.b44t.ui.Components.ChatActivityEnterView; -import com.b44t.ui.Components.LayoutHelper; -import com.b44t.ui.Components.PopupAudioView; -import com.b44t.ui.Components.SizeNotifierFrameLayout; -import com.b44t.ui.ActionBar.Theme; - -import java.io.File; -import java.util.ArrayList; -import java.util.Locale; - -public class PopupNotificationActivity extends Activity implements NotificationCenter.NotificationCenterDelegate { - - private ActionBar actionBar; - private ChatActivityEnterView chatActivityEnterView; - private BackupImageView avatarImageView; - private TextView nameTextView; - private TextView onlineTextView; - private FrameLayout avatarContainer; - private TextView countText; - private ViewGroup messageContainer; - private ViewGroup centerView; - private ViewGroup leftView; - private ViewGroup rightView; - private RelativeLayout popupContainer; - private ArrayList textViews = new ArrayList<>(); - private ArrayList imageViews = new ArrayList<>(); - private ArrayList audioViews = new ArrayList<>(); - private VelocityTracker velocityTracker = null; - //private TypingDotsDrawable typingDotsDrawable; - //private RecordStatusDrawable recordStatusDrawable; - - private int classGuid; - private TLRPC.User currentUser; - private TLRPC.Chat currentChat; - private boolean finished = false; - private CharSequence lastPrintString; - private MessageObject currentMessageObject = null; - private int currentMessageNum = 0; - private PowerManager.WakeLock wakeLock = null; - private boolean animationInProgress = false; - private long animationStartTime = 0; - private float moveStartX = -1; - private boolean startedMoving = false; - private Runnable onAnimationEndRunnable = null; - - private class FrameLayoutTouch extends FrameLayout { - public FrameLayoutTouch(Context context) { - super(context); - } - - public FrameLayoutTouch(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public FrameLayoutTouch(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - } - - @Override - public boolean onInterceptTouchEvent(MotionEvent ev) { - return checkTransitionAnimation() || ((PopupNotificationActivity) getContext()).onTouchEventMy(ev); - } - - @Override - public boolean onTouchEvent(MotionEvent ev) { - return checkTransitionAnimation() || ((PopupNotificationActivity) getContext()).onTouchEventMy(ev); - } - - @Override - public void requestDisallowInterceptTouchEvent(boolean disallowIntercept) { - ((PopupNotificationActivity)getContext()).onTouchEventMy(null); - super.requestDisallowInterceptTouchEvent(disallowIntercept); - } - } - - public class FrameLayoutAnimationListener extends FrameLayout { - public FrameLayoutAnimationListener(Context context) { - super(context); - } - - public FrameLayoutAnimationListener(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public FrameLayoutAnimationListener(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - } - - @Override - protected void onAnimationEnd() { - super.onAnimationEnd(); - if (onAnimationEndRunnable != null) { - onAnimationEndRunnable.run(); - onAnimationEndRunnable = null; - } - } - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - Theme.loadRecources(this); - - int resourceId = getResources().getIdentifier("status_bar_height", "dimen", "android"); - if (resourceId > 0) { - AndroidUtilities.statusBarHeight = getResources().getDimensionPixelSize(resourceId); - } - - classGuid = ConnectionsManager.getInstance().generateClassGuid(); - NotificationCenter.getInstance().addObserver(this, NotificationCenter.appDidLogout); - NotificationCenter.getInstance().addObserver(this, NotificationCenter.pushMessagesUpdated); - NotificationCenter.getInstance().addObserver(this, NotificationCenter.updateInterfaces); - NotificationCenter.getInstance().addObserver(this, NotificationCenter.audioProgressDidChanged); - NotificationCenter.getInstance().addObserver(this, NotificationCenter.audioDidReset); - NotificationCenter.getInstance().addObserver(this, NotificationCenter.contactsDidLoaded); - NotificationCenter.getInstance().addObserver(this, NotificationCenter.emojiDidLoaded); - - //typingDotsDrawable = new TypingDotsDrawable(); - //recordStatusDrawable = new RecordStatusDrawable(); - - SizeNotifierFrameLayout contentView = new SizeNotifierFrameLayout(this) { - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - //int widthMode = MeasureSpec.getMode(widthMeasureSpec); - //int heightMode = MeasureSpec.getMode(heightMeasureSpec); - int widthSize = MeasureSpec.getSize(widthMeasureSpec); - int heightSize = MeasureSpec.getSize(heightMeasureSpec); - - setMeasuredDimension(widthSize, heightSize); - - int keyboardSize = getKeyboardHeight(); - - if (keyboardSize <= AndroidUtilities.dp(20)) { - heightSize -= chatActivityEnterView.getEmojiPadding(); - } - - int childCount = getChildCount(); - for (int i = 0; i < childCount; i++) { - View child = getChildAt(i); - if (child.getVisibility() == GONE) { - continue; - } - if (chatActivityEnterView.isPopupView(child)) { - child.measure(MeasureSpec.makeMeasureSpec(widthSize, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(child.getLayoutParams().height, MeasureSpec.EXACTLY)); - } else if (chatActivityEnterView.isRecordCircle(child)) { - measureChildWithMargins(child, widthMeasureSpec, 0, heightMeasureSpec, 0); - } else { - child.measure(MeasureSpec.makeMeasureSpec(widthSize, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(Math.max(AndroidUtilities.dp(10), heightSize + AndroidUtilities.dp(2)), MeasureSpec.EXACTLY)); - } - } - } - - @Override - protected void onLayout(boolean changed, int l, int t, int r, int b) { - final int count = getChildCount(); - - int paddingBottom = getKeyboardHeight() <= AndroidUtilities.dp(20) ? chatActivityEnterView.getEmojiPadding() : 0; - - for (int i = 0; i < count; i++) { - final View child = getChildAt(i); - if (child.getVisibility() == GONE) { - continue; - } - final LayoutParams lp = (LayoutParams) child.getLayoutParams(); - - int width = child.getMeasuredWidth(); - int height = child.getMeasuredHeight(); - - int childLeft; - int childTop; - - int gravity = lp.gravity; - if (gravity == -1) { - gravity = Gravity.TOP | Gravity.LEFT; - } - - final int absoluteGravity = gravity & Gravity.HORIZONTAL_GRAVITY_MASK; - final int verticalGravity = gravity & Gravity.VERTICAL_GRAVITY_MASK; - - switch (absoluteGravity & Gravity.HORIZONTAL_GRAVITY_MASK) { - case Gravity.CENTER_HORIZONTAL: - childLeft = (r - l - width) / 2 + lp.leftMargin - lp.rightMargin; - break; - case Gravity.RIGHT: - childLeft = r - width - lp.rightMargin; - break; - case Gravity.LEFT: - default: - childLeft = lp.leftMargin; - } - - switch (verticalGravity) { - case Gravity.TOP: - childTop = lp.topMargin; - break; - case Gravity.CENTER_VERTICAL: - childTop = ((b - paddingBottom) - t - height) / 2 + lp.topMargin - lp.bottomMargin; - break; - case Gravity.BOTTOM: - childTop = ((b - paddingBottom) - t) - height - lp.bottomMargin; - break; - default: - childTop = lp.topMargin; - } - if (chatActivityEnterView.isPopupView(child)) { - childTop = paddingBottom != 0 ? getMeasuredHeight() - paddingBottom : getMeasuredHeight(); - } else if (chatActivityEnterView.isRecordCircle(child)) { - childTop = popupContainer.getTop() + popupContainer.getMeasuredHeight() - child.getMeasuredHeight() - lp.bottomMargin; - childLeft = popupContainer.getLeft() + popupContainer.getMeasuredWidth() - child.getMeasuredWidth() - lp.rightMargin; - } - child.layout(childLeft, childTop, childLeft + width, childTop + height); - } - - notifyHeightChanged(); - } - }; - setContentView(contentView); - contentView.setBackgroundColor(0x99000000); - - RelativeLayout relativeLayout = new RelativeLayout(this); - contentView.addView(relativeLayout, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT)); - - popupContainer = new RelativeLayout(this); - popupContainer.setBackgroundColor(0xffffffff); - relativeLayout.addView(popupContainer, LayoutHelper.createRelative(LayoutHelper.MATCH_PARENT, 240, 12, 0, 12, 0, RelativeLayout.CENTER_IN_PARENT)); - - if (chatActivityEnterView != null) { - chatActivityEnterView.onDestroy(); - } - chatActivityEnterView = new ChatActivityEnterView(this, contentView, null, false); - popupContainer.addView(chatActivityEnterView, LayoutHelper.createRelative(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, RelativeLayout.ALIGN_PARENT_BOTTOM)); - chatActivityEnterView.setDelegate(new ChatActivityEnterView.ChatActivityEnterViewDelegate() { - @Override - public void onMessageSend(CharSequence message) { - if (currentMessageObject == null) { - return; - } - if (currentMessageNum >= 0 && currentMessageNum < NotificationsController.getInstance().popupMessages.size()) { - NotificationsController.getInstance().popupMessages.remove(currentMessageNum); - } - //MessagesController.getInstance().markDialogAsRead(currentMessageObject.getDialogId(), currentMessageObject.getId(), Math.max(0, currentMessageObject.getId()), currentMessageObject.messageOwner.date, true, true); - MrMailbox.markseenMsg((int)currentMessageObject.getId()); - currentMessageObject = null; - getNewMessage(); - } - - @Override - public void onTextChanged(CharSequence text, boolean big) { - - } - - /* - @Override - public void onMessageEditEnd(boolean loading) { - - } - */ - - @Override - public void needSendTyping() { - if (currentMessageObject != null) { - MessagesController.getInstance().sendTyping(currentMessageObject.getDialogId(), 0, classGuid); - } - } - - @Override - public void onAttachButtonHidden() { - - } - - @Override - public void onAttachButtonShow() { - - } - - @Override - public void onWindowSizeChanged(int size) { - - } - - @Override - public void onStickersTab(boolean opened) { - - } - }); - - messageContainer = new FrameLayoutTouch(this); - popupContainer.addView(messageContainer, 0); - - actionBar = new ActionBar(this); - actionBar.setOccupyStatusBar(false); - actionBar.setBackButtonImage(R.drawable.ic_ab_back); - actionBar.setBackgroundColor(Theme.ACTION_BAR_COLOR); - actionBar.setItemsBackgroundColor(Theme.ACTION_BAR_SELECTOR_COLOR); - popupContainer.addView(actionBar); - ViewGroup.LayoutParams layoutParams = actionBar.getLayoutParams(); - layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT; - actionBar.setLayoutParams(layoutParams); - - ActionBarMenu menu = actionBar.createMenu(); - View view = menu.addItemResource(2, R.layout.popup_count_layout); - countText = (TextView) view.findViewById(R.id.count_text); - - avatarContainer = new FrameLayout(this); - avatarContainer.setPadding(AndroidUtilities.dp(4), 0, AndroidUtilities.dp(4), 0); - actionBar.addView(avatarContainer); - FrameLayout.LayoutParams layoutParams2 = (FrameLayout.LayoutParams) avatarContainer.getLayoutParams(); - layoutParams2.height = LayoutHelper.MATCH_PARENT; - layoutParams2.width = LayoutHelper.WRAP_CONTENT; - layoutParams2.rightMargin = AndroidUtilities.dp(48); - layoutParams2.leftMargin = AndroidUtilities.dp(60); - layoutParams2.gravity = Gravity.TOP | Gravity.LEFT; - avatarContainer.setLayoutParams(layoutParams2); - - avatarImageView = new BackupImageView(this); - avatarImageView.setRoundRadius(AndroidUtilities.dp(21)); - avatarContainer.addView(avatarImageView); - layoutParams2 = (FrameLayout.LayoutParams) avatarImageView.getLayoutParams(); - layoutParams2.width = AndroidUtilities.dp(42); - layoutParams2.height = AndroidUtilities.dp(42); - layoutParams2.topMargin = AndroidUtilities.dp(3); - avatarImageView.setLayoutParams(layoutParams2); - - nameTextView = new TextView(this); - nameTextView.setTextColor(0xffffffff); - nameTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 18); - nameTextView.setLines(1); - nameTextView.setMaxLines(1); - nameTextView.setSingleLine(true); - nameTextView.setEllipsize(TextUtils.TruncateAt.END); - nameTextView.setGravity(Gravity.LEFT); - nameTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf")); - avatarContainer.addView(nameTextView); - layoutParams2 = (FrameLayout.LayoutParams) nameTextView.getLayoutParams(); - layoutParams2.width = LayoutHelper.WRAP_CONTENT; - layoutParams2.height = LayoutHelper.WRAP_CONTENT; - layoutParams2.leftMargin = AndroidUtilities.dp(54); - layoutParams2.bottomMargin = AndroidUtilities.dp(22); - layoutParams2.gravity = Gravity.BOTTOM; - nameTextView.setLayoutParams(layoutParams2); - - onlineTextView = new TextView(this); - onlineTextView.setTextColor(Theme.ACTION_BAR_SUBTITLE_COLOR); - onlineTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14); - onlineTextView.setLines(1); - onlineTextView.setMaxLines(1); - onlineTextView.setSingleLine(true); - onlineTextView.setEllipsize(TextUtils.TruncateAt.END); - onlineTextView.setGravity(Gravity.LEFT); - avatarContainer.addView(onlineTextView); - layoutParams2 = (FrameLayout.LayoutParams) onlineTextView.getLayoutParams(); - layoutParams2.width = LayoutHelper.WRAP_CONTENT; - layoutParams2.height = LayoutHelper.WRAP_CONTENT; - layoutParams2.leftMargin = AndroidUtilities.dp(54); - layoutParams2.bottomMargin = AndroidUtilities.dp(4); - layoutParams2.gravity = Gravity.BOTTOM; - onlineTextView.setLayoutParams(layoutParams2); - - actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() { - @Override - public void onItemClick(int id) { - if (id == -1) { - onFinish(); - finish(); - } else if (id == 1) { - openCurrentMessage(); - } else if (id == 2) { - switchToNextMessage(); - } - } - }); - - PowerManager pm = (PowerManager) ApplicationLoader.applicationContext.getSystemService(Context.POWER_SERVICE); - wakeLock = pm.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, "screen"); - wakeLock.setReferenceCounted(false); - - handleIntent(getIntent()); - } - - @Override - public void onConfigurationChanged(Configuration newConfig) { - super.onConfigurationChanged(newConfig); - AndroidUtilities.checkDisplaySize(); - fixLayout(); - } - - @Override - protected void onNewIntent(Intent intent) { - super.onNewIntent(intent); - handleIntent(intent); - } - - @Override - public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { - super.onRequestPermissionsResult(requestCode, permissions, grantResults); - if (requestCode == 3) { - if (grantResults[0] == PackageManager.PERMISSION_GRANTED) { - return; - } - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setMessage(LocaleController.getString("PermissionNoAudio", R.string.PermissionNoAudio)); - builder.setPositiveButton(LocaleController.getString("PermissionOpenSettings", R.string.PermissionOpenSettings), new DialogInterface.OnClickListener() { - @TargetApi(Build.VERSION_CODES.GINGERBREAD) - @Override - public void onClick(DialogInterface dialog, int which) { - try { - // the settings button is needed as the user may have selected "do not ask again" and - // may get in trouble to activate the feature otherwise ... - Intent intent = new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS); - intent.setData(Uri.parse("package:" + ApplicationLoader.applicationContext.getPackageName())); - startActivity(intent); - } catch (Exception e) { - FileLog.e("messenger", e); - } - } - }); - builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null); - builder.show(); - } - } - - private void switchToNextMessage() { - if (NotificationsController.getInstance().popupMessages.size() > 1) { - if (currentMessageNum < NotificationsController.getInstance().popupMessages.size() - 1) { - currentMessageNum++; - } else { - currentMessageNum = 0; - } - currentMessageObject = NotificationsController.getInstance().popupMessages.get(currentMessageNum); - updateInterfaceForCurrentMessage(2); - countText.setText(String.format("%d/%d", currentMessageNum + 1, NotificationsController.getInstance().popupMessages.size())); - } - } - - private void switchToPreviousMessage() { - if (NotificationsController.getInstance().popupMessages.size() > 1) { - if (currentMessageNum > 0) { - currentMessageNum--; - } else { - currentMessageNum = NotificationsController.getInstance().popupMessages.size() - 1; - } - currentMessageObject = NotificationsController.getInstance().popupMessages.get(currentMessageNum); - updateInterfaceForCurrentMessage(1); - countText.setText(String.format("%d/%d", currentMessageNum + 1, NotificationsController.getInstance().popupMessages.size())); - } - } - - public boolean checkTransitionAnimation() { - if (animationInProgress && animationStartTime < System.currentTimeMillis() - 400) { - animationInProgress = false; - if (onAnimationEndRunnable != null) { - onAnimationEndRunnable.run(); - onAnimationEndRunnable = null; - } - } - return animationInProgress; - } - - public boolean onTouchEventMy(MotionEvent motionEvent) { - if (checkTransitionAnimation()) { - return false; - } - if (motionEvent != null && motionEvent.getAction() == MotionEvent.ACTION_DOWN) { - moveStartX = motionEvent.getX(); - } else if (motionEvent != null && motionEvent.getAction() == MotionEvent.ACTION_MOVE) { - float x = motionEvent.getX(); - int diff = (int)(x - moveStartX); - if (moveStartX != -1 && !startedMoving) { - if (Math.abs(diff) > AndroidUtilities.dp(10)) { - startedMoving = true; - moveStartX = x; - AndroidUtilities.lockOrientation(this); - diff = 0; - if (velocityTracker == null) { - velocityTracker = VelocityTracker.obtain(); - } else { - velocityTracker.clear(); - } - } - } - if (startedMoving) { - if (leftView == null && diff > 0) { - diff = 0; - } - if (rightView == null && diff < 0) { - diff = 0; - } - if (velocityTracker != null) { - velocityTracker.addMovement(motionEvent); - } - applyViewsLayoutParams(diff); - } - } else if (motionEvent == null || motionEvent.getAction() == MotionEvent.ACTION_UP || motionEvent.getAction() == MotionEvent.ACTION_CANCEL) { - if (motionEvent != null && startedMoving) { - FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) centerView.getLayoutParams(); - int diff = (int)(motionEvent.getX() - moveStartX); - int width = AndroidUtilities.displaySize.x - AndroidUtilities.dp(24); - int moveDiff = 0; - int forceMove = 0; - View otherView = null; - if (velocityTracker != null) { - velocityTracker.computeCurrentVelocity(1000); - if (velocityTracker.getXVelocity() >= 3500) { - forceMove = 1; - } else if (velocityTracker.getXVelocity() <= -3500) { - forceMove = 2; - } - } - if ((forceMove == 1 || diff > width / 3) && leftView != null) { - moveDiff = width - layoutParams.leftMargin; - otherView = leftView; - onAnimationEndRunnable = new Runnable() { - @Override - public void run() { - animationInProgress = false; - switchToPreviousMessage(); - AndroidUtilities.unlockOrientation(PopupNotificationActivity.this); - } - }; - } else if ((forceMove == 2 || diff < -width / 3) && rightView != null) { - moveDiff = -width - layoutParams.leftMargin; - otherView = rightView; - onAnimationEndRunnable = new Runnable() { - @Override - public void run() { - animationInProgress = false; - switchToNextMessage(); - AndroidUtilities.unlockOrientation(PopupNotificationActivity.this); - } - }; - } else if (layoutParams.leftMargin != 0) { - moveDiff = -layoutParams.leftMargin; - otherView = diff > 0 ? leftView : rightView; - onAnimationEndRunnable = new Runnable() { - @Override - public void run() { - animationInProgress = false; - applyViewsLayoutParams(0); - AndroidUtilities.unlockOrientation(PopupNotificationActivity.this); - } - }; - } - if (moveDiff != 0) { - int time = (int)(Math.abs((float)moveDiff / (float)width) * 200); - TranslateAnimation animation = new TranslateAnimation(0, moveDiff, 0, 0); - animation.setDuration(time); - centerView.startAnimation(animation); - if (otherView != null) { - animation = new TranslateAnimation(0, moveDiff, 0, 0); - animation.setDuration(time); - otherView.startAnimation(animation); - } - animationInProgress = true; - animationStartTime = System.currentTimeMillis(); - } - } else { - applyViewsLayoutParams(0); - } - if (velocityTracker != null) { - velocityTracker.recycle(); - velocityTracker = null; - } - startedMoving = false; - moveStartX = -1; - } - return startedMoving; - } - - private void applyViewsLayoutParams(int xOffset) { - FrameLayout.LayoutParams layoutParams; - int widht = AndroidUtilities.displaySize.x - AndroidUtilities.dp(24); - if (leftView != null) { - layoutParams = (FrameLayout.LayoutParams) leftView.getLayoutParams(); - layoutParams.gravity = Gravity.TOP | Gravity.LEFT; - layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT; - layoutParams.width = widht; - layoutParams.leftMargin = -widht + xOffset; - leftView.setLayoutParams(layoutParams); - } - if (centerView != null) { - layoutParams = (FrameLayout.LayoutParams) centerView.getLayoutParams(); - layoutParams.gravity = Gravity.TOP | Gravity.LEFT; - layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT; - layoutParams.width = widht; - layoutParams.leftMargin = xOffset; - centerView.setLayoutParams(layoutParams); - } - if (rightView != null) { - layoutParams = (FrameLayout.LayoutParams) rightView.getLayoutParams(); - layoutParams.gravity = Gravity.TOP | Gravity.LEFT; - layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT; - layoutParams.width = widht; - layoutParams.leftMargin = widht + xOffset; - rightView.setLayoutParams(layoutParams); - } - messageContainer.invalidate(); - } - - private ViewGroup getViewForMessage(int num, boolean applyOffset) { - if (NotificationsController.getInstance().popupMessages.size() == 1 && (num < 0 || num >= NotificationsController.getInstance().popupMessages.size())) { - return null; - } - if (num == -1) { - num = NotificationsController.getInstance().popupMessages.size() - 1; - } else if (num == NotificationsController.getInstance().popupMessages.size()) { - num = 0; - } - ViewGroup view; - MessageObject messageObject = NotificationsController.getInstance().popupMessages.get(num); - if (messageObject.type == 1 || messageObject.type == 4) { - if (imageViews.size() > 0) { - view = imageViews.get(0); - imageViews.remove(0); - } else { - view = new FrameLayoutAnimationListener(this); - view.addView(getLayoutInflater().inflate(R.layout.popup_image_layout, null)); - view.setTag(2); - - view.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - openCurrentMessage(); - } - }); - } - - TextView messageText = (TextView)view.findViewById(R.id.message_text); - BackupImageView imageView = (BackupImageView) view.findViewById(R.id.message_image); - imageView.setAspectFit(true); - - if (messageObject.type == 1) { - TLRPC.PhotoSize currentPhotoObject = FileLoader.getClosestPhotoSizeWithSize(messageObject.photoThumbs, AndroidUtilities.getPhotoSize()); - TLRPC.PhotoSize thumb = FileLoader.getClosestPhotoSizeWithSize(messageObject.photoThumbs, 100); - boolean photoSet = false; - if (currentPhotoObject != null) { - boolean photoExist = true; - if (messageObject.type == 1) { - File cacheFile = FileLoader.getPathToMessage(messageObject.messageOwner); - if (!cacheFile.exists()) { - photoExist = false; - } - } - if (photoExist || MediaController.getInstance().canDownloadMedia(MediaController.AUTODOWNLOAD_MASK_PHOTO)) { - imageView.setImage(currentPhotoObject.location, "100_100", thumb.location, currentPhotoObject.size); - photoSet = true; - } else { - if (thumb != null) { - imageView.setImage(thumb.location, null, (Drawable) null); - photoSet = true; - } - } - } - if (!photoSet) { - imageView.setVisibility(View.GONE); - messageText.setVisibility(View.VISIBLE); - messageText.setTextSize(TypedValue.COMPLEX_UNIT_SP, MessagesController.getInstance().fontSize); - messageText.setText(messageObject.messageText); - } else { - imageView.setVisibility(View.VISIBLE); - messageText.setVisibility(View.GONE); - } - } else if (messageObject.type == 4) { - messageText.setVisibility(View.GONE); - messageText.setText(messageObject.messageText); - imageView.setVisibility(View.VISIBLE); - double lat = messageObject.messageOwner.media.geo.lat; - double lon = messageObject.messageOwner.media.geo._long; - String currentUrl = String.format(Locale.US, "https://maps.googleapis.com/maps/api/staticmap?center=%f,%f&zoom=13&size=100x100&maptype=roadmap&scale=%d&markers=color:red|size:big|%f,%f&sensor=false", lat, lon, Math.min(2, (int)Math.ceil(AndroidUtilities.density)), lat, lon); - imageView.setImage(currentUrl, null, null); - } - } else if (messageObject.type == 2) { - PopupAudioView cell; - if (audioViews.size() > 0) { - view = audioViews.get(0); - audioViews.remove(0); - cell = (PopupAudioView)view.findViewWithTag(300); - } else { - view = new FrameLayoutAnimationListener(this); - view.addView(getLayoutInflater().inflate(R.layout.popup_audio_layout, null)); - view.setTag(3); - - view.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - openCurrentMessage(); - } - }); - - ViewGroup audioContainer = (ViewGroup)view.findViewById(R.id.audio_container); - cell = new PopupAudioView(this); - cell.setTag(300); - audioContainer.addView(cell); - } - - cell.setMessageObject(messageObject); - if (MediaController.getInstance().canDownloadMedia(MediaController.AUTODOWNLOAD_MASK_AUDIO)) { - cell.downloadAudioIfNeed(); - } - } else { - if (textViews.size() > 0) { - view = textViews.get(0); - textViews.remove(0); - } else { - view = new FrameLayoutAnimationListener(this); - view.addView(getLayoutInflater().inflate(R.layout.popup_text_layout, null)); - view.setTag(1); - - View textContainer = view.findViewById(R.id.text_container); - textContainer.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - openCurrentMessage(); - } - }); - } - TextView messageText = (TextView)view.findViewById(R.id.message_text); - messageText.setTag(301); - messageText.setTextSize(TypedValue.COMPLEX_UNIT_SP, MessagesController.getInstance().fontSize); - messageText.setText(messageObject.messageText); - } - if (view.getParent() == null) { - messageContainer.addView(view); - } - view.setVisibility(View.VISIBLE); - - if (applyOffset) { - int widht = AndroidUtilities.displaySize.x - AndroidUtilities.dp(24); - FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) view.getLayoutParams(); - layoutParams.gravity = Gravity.TOP | Gravity.LEFT; - layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT; - layoutParams.width = widht; - if (num == currentMessageNum) { - layoutParams.leftMargin = 0; - } else if (num == currentMessageNum - 1) { - layoutParams.leftMargin = -widht; - } else if (num == currentMessageNum + 1) { - layoutParams.leftMargin = widht; - } - view.setLayoutParams(layoutParams); - view.invalidate(); - } - - return view; - } - - private void reuseView(ViewGroup view) { - if (view == null) { - return; - } - int tag = (Integer)view.getTag(); - view.setVisibility(View.GONE); - if (tag == 1) { - textViews.add(view); - } else if (tag == 2) { - imageViews.add(view); - } else if (tag == 3) { - audioViews.add(view); - } - } - - private void prepareLayouts(int move) { - if (move == 0) { - reuseView(centerView); - reuseView(leftView); - reuseView(rightView); - for (int a = currentMessageNum - 1; a < currentMessageNum + 2; a++) { - if (a == currentMessageNum - 1) { - leftView = getViewForMessage(a, true); - } else if (a == currentMessageNum) { - centerView = getViewForMessage(a, true); - } else if (a == currentMessageNum + 1) { - rightView = getViewForMessage(a, true); - } - } - } else if (move == 1) { - reuseView(rightView); - rightView = centerView; - centerView = leftView; - leftView = getViewForMessage(currentMessageNum - 1, true); - } else if (move == 2) { - reuseView(leftView); - leftView = centerView; - centerView = rightView; - rightView = getViewForMessage(currentMessageNum + 1, true); - } else if (move == 3) { - if (rightView != null) { - int offset = ((FrameLayout.LayoutParams) rightView.getLayoutParams()).leftMargin; - reuseView(rightView); - if ((rightView = getViewForMessage(currentMessageNum + 1, false)) != null) { - int widht = AndroidUtilities.displaySize.x - AndroidUtilities.dp(24); - FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) rightView.getLayoutParams(); - layoutParams.gravity = Gravity.TOP | Gravity.LEFT; - layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT; - layoutParams.width = widht; - layoutParams.leftMargin = offset; - rightView.setLayoutParams(layoutParams); - rightView.invalidate(); - } - } - } else if (move == 4) { - if (leftView != null) { - int offset = ((FrameLayout.LayoutParams) leftView.getLayoutParams()).leftMargin; - reuseView(leftView); - if ((leftView = getViewForMessage(0, false)) != null) { - int widht = AndroidUtilities.displaySize.x - AndroidUtilities.dp(24); - FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) leftView.getLayoutParams(); - layoutParams.gravity = Gravity.TOP | Gravity.LEFT; - layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT; - layoutParams.width = widht; - layoutParams.leftMargin = offset; - leftView.setLayoutParams(layoutParams); - leftView.invalidate(); - } - } - } - } - - private void fixLayout() { - if (avatarContainer != null) { - avatarContainer.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() { - @Override - public boolean onPreDraw() { - if (avatarContainer != null) { - avatarContainer.getViewTreeObserver().removeOnPreDrawListener(this); - } - int padding = (ActionBar.getCurrentActionBarHeight() - AndroidUtilities.dp(48)) / 2; - avatarContainer.setPadding(avatarContainer.getPaddingLeft(), padding, avatarContainer.getPaddingRight(), padding); - return true; - } - }); - } - if (messageContainer != null) { - messageContainer.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() { - @Override - public boolean onPreDraw() { - messageContainer.getViewTreeObserver().removeOnPreDrawListener(this); - if (!checkTransitionAnimation() && !startedMoving) { - ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) messageContainer.getLayoutParams(); - layoutParams.topMargin = ActionBar.getCurrentActionBarHeight(); - layoutParams.bottomMargin = AndroidUtilities.dp(48); - layoutParams.width = ViewGroup.MarginLayoutParams.MATCH_PARENT; - layoutParams.height = ViewGroup.MarginLayoutParams.MATCH_PARENT; - messageContainer.setLayoutParams(layoutParams); - applyViewsLayoutParams(0); - } - return true; - } - }); - } - } - - private void handleIntent(Intent intent) { - KeyguardManager km = (KeyguardManager) getSystemService(KEYGUARD_SERVICE); - if (km.inKeyguardRestrictedInputMode() || !ApplicationLoader.isScreenOn) { - getWindow().addFlags( - WindowManager.LayoutParams.FLAG_DIM_BEHIND | - WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED | - WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON | - WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN); - } else { - getWindow().addFlags( - WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED | - WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON | - WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN); - getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND); - } - - if (currentMessageObject == null) { - currentMessageNum = 0; - } - getNewMessage(); - } - - private void getNewMessage() { - if (NotificationsController.getInstance().popupMessages.isEmpty()) { - onFinish(); - finish(); - return; - } - - boolean found = false; - if ((currentMessageNum != 0 || chatActivityEnterView.hasText() || startedMoving) && currentMessageObject != null) { - for (int a = 0; a < NotificationsController.getInstance().popupMessages.size(); a++) { - if (NotificationsController.getInstance().popupMessages.get(a).getId() == currentMessageObject.getId()) { - currentMessageNum = a; - found = true; - break; - } - } - } - if (!found) { - currentMessageNum = 0; - currentMessageObject = NotificationsController.getInstance().popupMessages.get(0); - updateInterfaceForCurrentMessage(0); - } else if (startedMoving) { - if (currentMessageNum == NotificationsController.getInstance().popupMessages.size() - 1) { - prepareLayouts(3); - } else if (currentMessageNum == 1) { - prepareLayouts(4); - } - } - countText.setText(String.format("%d/%d", currentMessageNum + 1, NotificationsController.getInstance().popupMessages.size())); - } - - private void openCurrentMessage() { - if (currentMessageObject == null) { - return; - } - Intent intent = new Intent(ApplicationLoader.applicationContext, LaunchActivity.class); - long dialog_id = currentMessageObject.getDialogId(); - if ((int)dialog_id != 0) { - int lower_id = (int)dialog_id; - if (lower_id < 0) { - intent.putExtra("chatId", -lower_id); - } else { - intent.putExtra("userId", lower_id); - } - } /*else { - intent.putExtra("encId", (int)(dialog_id >> 32)); - } */ - intent.setAction("com.b44t.messenger.openchat" + Math.random() + Integer.MAX_VALUE); - intent.setFlags(0x00008000); - startActivity(intent); - onFinish(); - finish(); - } - - private void updateInterfaceForCurrentMessage(int move) { - if (actionBar == null) { - return; - } - currentChat = null; - currentUser = null; - long dialog_id = currentMessageObject.getDialogId(); - chatActivityEnterView.setDialogId(dialog_id); - if ((int)dialog_id != 0) { - int lower_id = (int)dialog_id; - if (lower_id > 0) { - currentUser = MessagesController.getInstance().getUser(lower_id); - } else { - currentChat = MessagesController.getInstance().getChat(-lower_id); - currentUser = MessagesController.getInstance().getUser(currentMessageObject.messageOwner.from_id); - } - } - - if (currentChat != null && currentUser != null) { - nameTextView.setText(currentChat.title); - onlineTextView.setText(UserObject.getUserName(currentUser)); - nameTextView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); - nameTextView.setCompoundDrawablePadding(0); - } else if (currentUser != null) { - nameTextView.setText(UserObject.getUserName(currentUser)); - /*if ((int)dialog_id == 0) { - nameTextView.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_lock_white, 0, 0, 0); - nameTextView.setCompoundDrawablePadding(AndroidUtilities.dp(4)); - } else*/ { - nameTextView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); - nameTextView.setCompoundDrawablePadding(0); - } - } - - prepareLayouts(move); - updateSubtitle(); - checkAndUpdateAvatar(); - applyViewsLayoutParams(0); - } - - private void updateSubtitle() { - if (actionBar == null) { - return; - } - if (currentChat != null || currentUser == null) { - return; - } - /*if ( currentUser.id / 1000 != 777 && currentUser.id / 1000 != 333 && ContactsController.getInstance().contactsDict.get(currentUser.id) == null && (ContactsController.getInstance().contactsDict.size() != 0 || !ContactsController.getInstance().isLoadingContacts())) { - if (currentUser.phone != null && currentUser.phone.length() != 0) { - nameTextView.setText(PhoneFormat.getInstance().format("+" + currentUser.phone)); - } else { - nameTextView.setText(UserObject.getUserName(currentUser)); - } - } else*/ { - nameTextView.setText(UserObject.getUserName(currentUser)); - } - CharSequence printString = MessagesController.getInstance().printingStrings.get(currentMessageObject.getDialogId()); - if (printString == null || printString.length() == 0) { - lastPrintString = null; - //setTypingAnimation(false); - TLRPC.User user = MessagesController.getInstance().getUser(currentUser.id); - if (user != null) { - currentUser = user; - } - onlineTextView.setText(LocaleController.formatUserStatus(currentUser)); - } else { - lastPrintString = printString; - onlineTextView.setText(printString); - //setTypingAnimation(true); - } - } - - private void checkAndUpdateAvatar() { - TLRPC.FileLocation newPhoto = null; - AvatarDrawable avatarDrawable = null; - if (currentChat != null) { - TLRPC.Chat chat = MessagesController.getInstance().getChat(currentChat.id); - if (chat == null) { - return; - } - currentChat = chat; - if (currentChat.photo != null) { - newPhoto = currentChat.photo.photo_small; - } - avatarDrawable = new AvatarDrawable(currentChat); - } else if (currentUser != null) { - TLRPC.User user = MessagesController.getInstance().getUser(currentUser.id); - if (user == null) { - return; - } - currentUser = user; - if (currentUser.photo != null) { - newPhoto = currentUser.photo.photo_small; - } - avatarDrawable = new AvatarDrawable(currentUser); - } - if (avatarImageView != null) { - avatarImageView.setImage(newPhoto, "50_50", avatarDrawable); - } - } - - /* - private void setTypingAnimation(boolean start) { - if (actionBar == null) { - return; - } - if (start) { - try { - Integer type = MessagesController.getInstance().printingStringsTypes.get(currentMessageObject.getDialogId()); - if (type == 0) { - onlineTextView.setCompoundDrawablesWithIntrinsicBounds(typingDotsDrawable, null, null, null); - onlineTextView.setCompoundDrawablePadding(AndroidUtilities.dp(4)); - typingDotsDrawable.start(); - recordStatusDrawable.stop(); - } else if (type == 1) { - onlineTextView.setCompoundDrawablesWithIntrinsicBounds(recordStatusDrawable, null, null, null); - onlineTextView.setCompoundDrawablePadding(AndroidUtilities.dp(4)); - recordStatusDrawable.start(); - typingDotsDrawable.stop(); - } - } catch (Exception e) { - FileLog.e("messenger", e); - } - } else { - onlineTextView.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null); - onlineTextView.setCompoundDrawablePadding(0); - typingDotsDrawable.stop(); - recordStatusDrawable.stop(); - } - } - */ - - @Override - public void onBackPressed() { - if (chatActivityEnterView.isPopupShowing()) { - chatActivityEnterView.hidePopup(true); - return; - } - super.onBackPressed(); - } - - @Override - protected void onResume() { - super.onResume(); - if (chatActivityEnterView != null) { - chatActivityEnterView.setFieldFocused(true); - } - ConnectionsManager.getInstance().setAppPaused(false, false); - fixLayout(); - checkAndUpdateAvatar(); - wakeLock.acquire(7000); - } - - @Override - protected void onPause() { - super.onPause(); - overridePendingTransition(0, 0); - if (chatActivityEnterView != null) { - chatActivityEnterView.hidePopup(false); - chatActivityEnterView.setFieldFocused(false); - } - ConnectionsManager.getInstance().setAppPaused(true, false); - } - - @Override - public void didReceivedNotification(int id, Object... args) { - if (id == NotificationCenter.appDidLogout) { - /* EDIT BY MR - onFinish(); - finish(); - */ - } else if (id == NotificationCenter.pushMessagesUpdated) { - getNewMessage(); - } else if (id == NotificationCenter.updateInterfaces) { - if (currentMessageObject == null) { - return; - } - int updateMask = (Integer)args[0]; - if ((updateMask & MessagesController.UPDATE_MASK_NAME) != 0 || (updateMask & MessagesController.UPDATE_MASK_STATUS) != 0 || (updateMask & MessagesController.UPDATE_MASK_CHAT_NAME) != 0 || (updateMask & MessagesController.UPDATE_MASK_CHAT_MEMBERS) != 0) { - updateSubtitle(); - } - if ((updateMask & MessagesController.UPDATE_MASK_AVATAR) != 0 || (updateMask & MessagesController.UPDATE_MASK_CHAT_AVATAR) != 0) { - checkAndUpdateAvatar(); - } - if ((updateMask & MessagesController.UPDATE_MASK_USER_PRINT) != 0) { - CharSequence printString = MessagesController.getInstance().printingStrings.get(currentMessageObject.getDialogId()); - if (lastPrintString != null && printString == null || lastPrintString == null && printString != null || lastPrintString != null && printString != null && !lastPrintString.equals(printString)) { - updateSubtitle(); - } - } - } else if (id == NotificationCenter.audioDidReset) { - Integer mid = (Integer)args[0]; - if (messageContainer != null) { - int count = messageContainer.getChildCount(); - for (int a = 0; a < count; a++) { - View view = messageContainer.getChildAt(a); - if ((Integer)view.getTag() == 3) { - PopupAudioView cell = (PopupAudioView)view.findViewWithTag(300); - if (cell.getMessageObject() != null && cell.getMessageObject().getId() == mid) { - cell.updateButtonState(); - break; - } - } - } - } - } else if (id == NotificationCenter.audioProgressDidChanged) { - Integer mid = (Integer)args[0]; - if (messageContainer != null) { - int count = messageContainer.getChildCount(); - for (int a = 0; a < count; a++) { - View view = messageContainer.getChildAt(a); - if ((Integer)view.getTag() == 3) { - PopupAudioView cell = (PopupAudioView)view.findViewWithTag(300); - if (cell.getMessageObject() != null && cell.getMessageObject().getId() == mid) { - cell.updateProgress(); - break; - } - } - } - } - } else if (id == NotificationCenter.emojiDidLoaded) { - if (messageContainer != null) { - int count = messageContainer.getChildCount(); - for (int a = 0; a < count; a++) { - View view = messageContainer.getChildAt(a); - if ((Integer)view.getTag() == 1) { - TextView textView = (TextView)view.findViewWithTag(301); - if (textView != null) { - textView.invalidate(); - } - } - } - } - } else if (id == NotificationCenter.contactsDidLoaded) { - updateSubtitle(); - } - } - - @Override - protected void onDestroy() { - super.onDestroy(); - onFinish(); - if (wakeLock.isHeld()) { - wakeLock.release(); - } - if (avatarImageView != null) { - avatarImageView.setImageDrawable(null); - } - } - - protected void onFinish() { - if (finished) { - return; - } - finished = true; - NotificationCenter.getInstance().removeObserver(this, NotificationCenter.appDidLogout); - NotificationCenter.getInstance().removeObserver(this, NotificationCenter.pushMessagesUpdated); - NotificationCenter.getInstance().removeObserver(this, NotificationCenter.updateInterfaces); - NotificationCenter.getInstance().removeObserver(this, NotificationCenter.audioProgressDidChanged); - NotificationCenter.getInstance().removeObserver(this, NotificationCenter.audioDidReset); - NotificationCenter.getInstance().removeObserver(this, NotificationCenter.contactsDidLoaded); - NotificationCenter.getInstance().removeObserver(this, NotificationCenter.emojiDidLoaded); - if (chatActivityEnterView != null) { - chatActivityEnterView.onDestroy(); - } - if (wakeLock.isHeld()) { - wakeLock.release(); - } - } -} diff --git a/MessengerProj/src/main/res/values-de/strings.xml b/MessengerProj/src/main/res/values-de/strings.xml index d2f126ec3..3e6a49d6b 100644 --- a/MessengerProj/src/main/res/values-de/strings.xml +++ b/MessengerProj/src/main/res/values-de/strings.xml @@ -210,11 +210,6 @@ Nutzt eine batterieschonende Hintergrundverbindung, um Benachrichtigungen zu gewährleisten. Kontakte importieren LED-Farbe - Popup Mitteilungen - Kein Popup - Nur wenn Bildschirm „an“ - Nur wenn Bildschirm „aus“ - Popups immer anzeigen Anzahl in Popup anzeigen Kurz Lang diff --git a/MessengerProj/src/main/res/values-es/strings.xml b/MessengerProj/src/main/res/values-es/strings.xml index 0c08a98eb..7959b3849 100644 --- a/MessengerProj/src/main/res/values-es/strings.xml +++ b/MessengerProj/src/main/res/values-es/strings.xml @@ -210,11 +210,6 @@ Conexión de bajo impacto, en segundo plano, para recibir notificaciones. Úsala para tener notificaciones fiables. Importar contactos Color del LED - Notificaciones emergentes - Desactivadas - Con pantalla encendida - Con pantalla apagada - Mostrar siempre Globo en el ícono Cortas Largas diff --git a/MessengerProj/src/main/res/values-it/strings.xml b/MessengerProj/src/main/res/values-it/strings.xml index 5bea89cad..a15412443 100644 --- a/MessengerProj/src/main/res/values-it/strings.xml +++ b/MessengerProj/src/main/res/values-it/strings.xml @@ -210,11 +210,6 @@ Mantiene una connessione a basso impatto per ricevere le notifiche. Attivala per notifiche affidabili. Importa contatti Colore LED - Notifiche popup - Nessun popup - Solo con schermo acceso - Solo con schermo spento - Mostra sempre i popup Contatore badge Breve Lunga diff --git a/MessengerProj/src/main/res/values-nl/strings.xml b/MessengerProj/src/main/res/values-nl/strings.xml index 785bd937d..346d1e40f 100644 --- a/MessengerProj/src/main/res/values-nl/strings.xml +++ b/MessengerProj/src/main/res/values-nl/strings.xml @@ -210,11 +210,6 @@ Achtergrondverbinding voor meldingen. Inschakelen voor betrouwbare meldingen. Importeer contacten LED-kleur - Pop-up meldingen - Geen pop-up - Alleen bij scherm aan - Alleen bij scherm uit - Altijd pop-up tonen Badgenummer Kort Lang diff --git a/MessengerProj/src/main/res/values-pt/strings.xml b/MessengerProj/src/main/res/values-pt/strings.xml index 81c3b0cba..7c28322a8 100644 --- a/MessengerProj/src/main/res/values-pt/strings.xml +++ b/MessengerProj/src/main/res/values-pt/strings.xml @@ -210,11 +210,6 @@ Manter uma conexão de baixo impacto para receber notificações. Habilite para notificações mais confiáveis. Importar Contatos Cor do LED - Notificações Pop-up - Sem pop-up - Somente com a tela ligada - Somente com a tela desligada - Sempre mostrar pop-up Contador no Ícone Curta Longa diff --git a/MessengerProj/src/main/res/values-v21/styles.xml b/MessengerProj/src/main/res/values-v21/styles.xml index 4a9fe97a8..5b78b7cae 100644 --- a/MessengerProj/src/main/res/values-v21/styles.xml +++ b/MessengerProj/src/main/res/values-v21/styles.xml @@ -38,15 +38,6 @@ #4991cc - - diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml index df20e8a39..7f72a8705 100644 --- a/MessengerProj/src/main/res/values/strings.xml +++ b/MessengerProj/src/main/res/values/strings.xml @@ -210,11 +210,6 @@ Keep a low impact background connection to receive notifications. Enable for reliable notifications. Import Contacts LED Color - Popup Notifications - No popup - Only when screen \"on\" - Only when screen \"off\" - Always show popup Show count in popup Short Long diff --git a/MessengerProj/src/main/res/values/styles.xml b/MessengerProj/src/main/res/values/styles.xml index 2c3624eb8..0952b7d61 100644 --- a/MessengerProj/src/main/res/values/styles.xml +++ b/MessengerProj/src/main/res/values/styles.xml @@ -24,14 +24,6 @@ @drawable/bar_selector_style - -