diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java index 54bef311f..a548907a3 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java @@ -4483,8 +4483,8 @@ public class Theme { fallbackKeys.put(key_share_icon, key_windowBackgroundWhiteBlackText); fallbackKeys.put(key_share_linkBackground, key_windowBackgroundGray); fallbackKeys.put(key_share_linkText, key_windowBackgroundWhiteBlackText); - fallbackKeys.put(key_glass_defaultIcon, Theme.key_windowBackgroundWhiteGrayText6); - fallbackKeys.put(key_glass_defaultText, Theme.key_windowBackgroundWhiteGrayText6); + fallbackKeys.put(key_glass_defaultIcon, Theme.key_chat_messagePanelIcons); + fallbackKeys.put(key_glass_defaultText, Theme.key_chat_messagePanelText); for (int i = 0; i < keys_avatar_background.length; i++) { themeAccentExclusionKeys.add(keys_avatar_background[i]); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ActiveGiftAuctionsHintCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ActiveGiftAuctionsHintCell.java index 2f8fe279f..d4c50b12c 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ActiveGiftAuctionsHintCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ActiveGiftAuctionsHintCell.java @@ -175,7 +175,7 @@ public class ActiveGiftAuctionsHintCell extends BlurredFrameLayout implements Gi } else if (myPlace == 3) { str = getString(R.string.Gift2ActiveAuctionsActiveStatusWinning3Place); } else { - str = formatString(R.string.Gift2ActiveAuctionsActiveStatusWinningOtherPlace, myPlace); + str = formatPlace(myPlace); } messageTextView.setText(formatString(R.string.Gift2ActiveAuctionsActiveStatusWinningOne, str)); @@ -185,6 +185,21 @@ public class ActiveGiftAuctionsHintCell extends BlurredFrameLayout implements Gi updateColors(); } + private static String formatPlace(int place) { + int lastTwo = place % 100; + if (lastTwo >= 11 && lastTwo <= 13) { + return formatString(R.string.Gift2ActiveAuctionsActiveStatusWinningOtherTh, place); + } + + switch (place % 10) { + case 1: return formatString(R.string.Gift2ActiveAuctionsActiveStatusWinningOtherSt, place); + case 2: return formatString(R.string.Gift2ActiveAuctionsActiveStatusWinningOtherNd, place); + case 3: return formatString(R.string.Gift2ActiveAuctionsActiveStatusWinningOtherRd, place); + default: return formatString(R.string.Gift2ActiveAuctionsActiveStatusWinningOtherTh, place); + } + } + + private boolean isOutbid; private void onClick(View ignoredView) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index 888ae6e84..8782f68f9 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -10318,6 +10318,7 @@ public class ChatActivity extends BaseFragment implements if (index < 0) { index = contentView.getChildCount(); } + index = Math.min(index + 1, contentView.getChildCount()); contentView.addView(instantCameraView, index, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT, Gravity.LEFT | Gravity.TOP)); } @@ -16049,7 +16050,7 @@ public class ChatActivity extends BaseFragment implements return getScrollOffsetForMessage(getHeightForMessage(object, !TextUtils.isEmpty(highlightMessageQuote))) - scrollOffsetForQuote(object); } private int getScrollOffsetForMessage(int messageHeight) { - return (int) Math.max(-AndroidUtilities.dp(2), (chatListView.getMeasuredHeight() - blurredViewBottomOffset - chatListViewPaddingTop - messageHeight) / 2); + return (int) Math.max(-AndroidUtilities.dp(2), (chatListView.getMeasuredHeight() - blurredViewBottomOffset - chatListViewPaddingTop - windowInsetsStateHolder.getCurrentMaxBottomInset() - dp(44 + 9) - messageHeight) / 2); } private int scrollOffsetForQuote(MessageObject object) { @@ -16909,6 +16910,9 @@ public class ChatActivity extends BaseFragment implements if (switchingFromTopics && child == actionBar) { return true; } + if (child == instantCameraView) { + return true; + } if (getTag(BlurBehindDrawable.TAG_DRAWING_AS_BACKGROUND) != null) { boolean needBlur; if (((int) getTag(BlurBehindDrawable.TAG_DRAWING_AS_BACKGROUND)) == BlurBehindDrawable.STATIC_CONTENT) { @@ -16960,6 +16964,9 @@ public class ChatActivity extends BaseFragment implements } canvas.restore(); } else { + if (child == chatInputViewsContainer && instantCameraView != null && instantCameraView.getVisibility() == VISIBLE) { + super.drawChild(canvas, instantCameraView, drawingTime); + } result = super.drawChild(canvas, child, drawingTime); if (isVideo && child == chatListView && messageObject.type != MessageObject.TYPE_ROUND_VIDEO && videoPlayerContainer != null && videoPlayerContainer.getTag() != null) { canvas.save(); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java index 6f91b282e..eabf7b7a6 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java @@ -1519,6 +1519,17 @@ public class ChatActivityEnterView extends FrameLayout implements float locCx = rectF.centerX(); float locCy = rectF.centerY(); canvas.save(); + + final float transformToResume = Utilities.clamp(transformToSeekbar * 2f, 1, 0); + final int wasAlpha = lockPaint.getAlpha(); + final int saveToLayer = canvas.saveLayerAlpha( + locCx - dp(24), + locCy - dp(24), + locCx + dp(24), + locCy + dp(24), (int) (wasAlpha * (1f - transformToResume)), Canvas.ALL_SAVE_FLAG); + lockOutlinePaint.setAlpha(255); + lockPaint.setAlpha(255); + canvas.translate(0, dpf2(2) * (1f - moveProgress)); canvas.rotate(lockRotation, locCx, locCy); @@ -1541,13 +1552,10 @@ public class ChatActivityEnterView extends FrameLayout implements } Drawable resumeDrawable = null; - float transformToResume = Utilities.clamp(transformToSeekbar * 2f, 1, 0); if (transformToResume > 0) { resumeDrawable = isInVideoMode ? vidDrawable : micDrawable; } - int wasAlpha = lockPaint.getAlpha(); - lockPaint.setAlpha((int) (wasAlpha * (1f - transformToResume))); if (transformToPauseProgress > 0) { if (periodBackgroundDrawable == null) { canvas.drawRoundRect(rectF, dpf2(3), dpf2(3), lockBackgroundPaint); @@ -1569,6 +1577,8 @@ public class ChatActivityEnterView extends FrameLayout implements canvas.drawRoundRect(rectF, dpf2(3), dpf2(3), lockPaint); } lockPaint.setAlpha(wasAlpha); + lockOutlinePaint.setAlpha(wasAlpha); + canvas.restoreToCount(saveToLayer); if (resumeDrawable != null) { final float _s = 0.9285f; @@ -10643,6 +10653,7 @@ public class ChatActivityEnterView extends FrameLayout implements } } }; + emojiView.shouldDrawStickerSettings = true; if (!shouldDrawBackground) { emojiView.updateColors(); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java index a788027b2..82dcce33a 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java @@ -205,6 +205,7 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific private int gifTrendingTabNum = -2; private int gifFirstEmojiTabNum = -2; private boolean shouldDrawBackground = true; + public boolean shouldDrawStickerSettings; public boolean shouldLightenBackground = true; private FrameLayout stickersContainer; @@ -1945,7 +1946,7 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific } } }); - gifGridView.setPadding(0, searchFieldHeight, 0, AndroidUtilities.dp(44)); + gifGridView.setPadding(0, searchFieldHeight, 0, AndroidUtilities.dp(44) + bottomInset); gifGridView.setOverScrollMode(RecyclerListView.OVER_SCROLL_NEVER); ((SimpleItemAnimator) gifGridView.getItemAnimator()).setSupportsChangeAnimations(false); gifGridView.setAdapter(gifAdapter = new GifAdapter(context, true)); @@ -2600,7 +2601,7 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific public void onPageSelected(int position) { saveNewPage(); showBackspaceButton(position == 0, true); - showStickerSettingsButton(position == 2 && shouldDrawBackground, true); + showStickerSettingsButton(position == 2 && (shouldDrawBackground || shouldDrawStickerSettings), true); if (delegate.isSearchOpened()) { if (position == 0) { if (emojiSearchField != null) { @@ -4454,11 +4455,11 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific if (animation.equals(searchAnimation)) { gridView.setTranslationY(0); if (gridView == stickersGridView) { - gridView.setPadding(0, 0, 0, 0); + gridView.setPadding(0, 0, 0, bottomInset); } else if (gridView == emojiGridView) { - gridView.setPadding(AndroidUtilities.dp(5), 0, AndroidUtilities.dp(5), 0); + gridView.setPadding(AndroidUtilities.dp(5), 0, AndroidUtilities.dp(5), bottomInset); } else if (gridView == gifGridView) { - gridView.setPadding(0, searchFieldHeight, 0, 0); + gridView.setPadding(0, searchFieldHeight, 0, bottomInset); } searchAnimation = null; } @@ -4478,11 +4479,11 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific tabStrip.setTranslationY(-AndroidUtilities.dp(40)); } if (gridView == stickersGridView) { - gridView.setPadding(0, AndroidUtilities.dp(4), 0, 0); + gridView.setPadding(0, AndroidUtilities.dp(4), 0, bottomInset); } else if (gridView == emojiGridView) { - gridView.setPadding(AndroidUtilities.dp(5), 0, AndroidUtilities.dp(5), 0); + gridView.setPadding(AndroidUtilities.dp(5), 0, AndroidUtilities.dp(5), bottomInset); } else if (gridView == gifGridView) { - gridView.setPadding(0, searchFieldHeight, 0, 0); + gridView.setPadding(0, searchFieldHeight, 0, bottomInset); } if (gridView == gifGridView) { if (gifSearchAdapter.showTrendingWhenSearchEmpty = gifAdapter.results.size() > 0) { @@ -4656,11 +4657,11 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific int firstVisPos = layoutManager.findFirstVisibleItemPosition(); gridView.setTranslationY(0); if (gridView == stickersGridView) { - gridView.setPadding(0, AndroidUtilities.dp(36), 0, AndroidUtilities.dp(44)); + gridView.setPadding(0, AndroidUtilities.dp(36), 0, AndroidUtilities.dp(44) + bottomInset); } else if (gridView == gifGridView) { - gridView.setPadding(0, searchFieldHeight, 0, AndroidUtilities.dp(44)); + gridView.setPadding(0, searchFieldHeight, 0, AndroidUtilities.dp(44) + bottomInset); } else if (gridView == emojiGridView) { - gridView.setPadding(AndroidUtilities.dp(5), AndroidUtilities.dp(36), AndroidUtilities.dp(5), AndroidUtilities.dp(44)); + gridView.setPadding(AndroidUtilities.dp(5), AndroidUtilities.dp(36), AndroidUtilities.dp(5), AndroidUtilities.dp(44) + bottomInset); } if (firstVisPos != RecyclerView.NO_POSITION) { layoutManager.scrollToPositionWithOffset(firstVisPos, 0); @@ -4685,11 +4686,11 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific tabStrip.setTranslationY(0); } if (gridView == stickersGridView) { - gridView.setPadding(0, AndroidUtilities.dp(36), 0, AndroidUtilities.dp(44)); + gridView.setPadding(0, AndroidUtilities.dp(36), 0, AndroidUtilities.dp(44) + bottomInset); } else if (gridView == gifGridView) { - gridView.setPadding(0, AndroidUtilities.dp(36 + 4), 0, AndroidUtilities.dp(44)); + gridView.setPadding(0, AndroidUtilities.dp(36 + 4), 0, AndroidUtilities.dp(44) + bottomInset); } else if (gridView == emojiGridView) { - gridView.setPadding(AndroidUtilities.dp(5), AndroidUtilities.dp(36), AndroidUtilities.dp(5), AndroidUtilities.dp(44)); + gridView.setPadding(AndroidUtilities.dp(5), AndroidUtilities.dp(36), AndroidUtilities.dp(5), AndroidUtilities.dp(44) + bottomInset); } layoutManager.scrollToPositionWithOffset(0, 0); } @@ -5730,7 +5731,7 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific } } else if (currentPage == 1) { showBackspaceButton(false, false); - showStickerSettingsButton(shouldDrawBackground, false); + showStickerSettingsButton(shouldDrawBackground || shouldDrawStickerSettings, false); if (pager.getCurrentItem() != 2) { pager.setCurrentItem(2, false); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/Paint/Views/PipettePickerView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/Paint/Views/PipettePickerView.java index 174a353ee..19f6c40ad 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/Paint/Views/PipettePickerView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/Paint/Views/PipettePickerView.java @@ -165,8 +165,8 @@ public class PipettePickerView extends View { int bx = Math.round(positionX * bitmap.getWidth()), by = Math.round(positionY * bitmap.getHeight()); mColor = bitmap.getPixel( - Utilities.clamp(bx, bitmap.getWidth(), 0), - Utilities.clamp(by, bitmap.getHeight(), 0) + Utilities.clamp(bx, bitmap.getWidth() - 1, 0), + Utilities.clamp(by, bitmap.getHeight() - 1, 0) ); colorPaint.setColor(mColor); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Gifts/SendGiftSheet.java b/TMessagesProj/src/main/java/org/telegram/ui/Gifts/SendGiftSheet.java index bf1681e75..13c101d1c 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Gifts/SendGiftSheet.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Gifts/SendGiftSheet.java @@ -1,7 +1,7 @@ package org.telegram.ui.Gifts; import static org.telegram.messenger.AndroidUtilities.dp; -import static org.telegram.messenger.AndroidUtilities.lerp; +import static org.telegram.messenger.LocaleController.formatPluralString; import static org.telegram.messenger.LocaleController.formatPluralStringComma; import static org.telegram.messenger.LocaleController.formatSpannable; import static org.telegram.messenger.LocaleController.formatString; @@ -10,6 +10,10 @@ import static org.telegram.messenger.LocaleController.getString; import android.app.Activity; import android.content.Context; import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.PointF; +import android.graphics.drawable.ColorDrawable; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; import android.text.SpannableStringBuilder; @@ -25,6 +29,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.RecyclerView; import com.android.billingclient.api.BillingClient; import com.android.billingclient.api.BillingFlowParams; @@ -64,6 +69,8 @@ import org.telegram.ui.Components.CubicBezierInterpolator; import org.telegram.ui.Components.EditTextEmoji; import org.telegram.ui.Components.EditTextSuggestionsFix; import org.telegram.ui.Components.LayoutHelper; +import org.telegram.ui.Components.LinkSpanDrawable; +import org.telegram.ui.Components.MotionBackgroundDrawable; import org.telegram.ui.Components.Premium.GiftPremiumBottomSheet; import org.telegram.ui.Components.Premium.boosts.BoostDialogs; import org.telegram.ui.Components.Premium.boosts.BoostRepository; @@ -73,6 +80,10 @@ import org.telegram.ui.Components.SizeNotifierFrameLayout; import org.telegram.ui.Components.TypefaceSpan; import org.telegram.ui.Components.UItem; import org.telegram.ui.Components.UniversalAdapter; +import org.telegram.ui.Components.blur3.drawable.BlurredBackgroundDrawable; +import org.telegram.ui.Components.blur3.drawable.color.BlurredBackgroundColorProviderThemed; +import org.telegram.ui.Components.blur3.source.BlurredBackgroundSourceColor; +import org.telegram.ui.Components.chat.ViewPositionWatcher; import org.telegram.ui.LaunchActivity; import org.telegram.ui.ProfileActivity; import org.telegram.ui.Stars.StarGiftSheet; @@ -113,6 +124,7 @@ public class SendGiftSheet extends BottomSheetWithRecyclerListView implements No private final ButtonWithCounterView button; private final FrameLayout limitContainer; + private final @Nullable FrameLayout limitContainerWrapper; private final View limitProgressView; private final FrameLayout valueContainerView; private final TextView soldTextView, soldTextView2; @@ -208,6 +220,14 @@ public class SendGiftSheet extends BottomSheetWithRecyclerListView implements No maxHeight = Math.max(maxHeight, getMeasuredHeight()); } } + @Override + protected boolean drawChild(@NonNull Canvas canvas, View child, long drawingTime) { + if (child == backgroundView) { + return true; + } + return super.drawChild(canvas, child, drawingTime); + } + @Override protected void onLayout(boolean changed, int l, int t, int r, int b) { super.onLayout(changed, l, t, r, b); @@ -215,7 +235,29 @@ public class SendGiftSheet extends BottomSheetWithRecyclerListView implements No actionCell.setVisiblePart(chatLinearLayout.getY() + actionCell.getY(), getBackgroundSizeY()); } }; - chatView.setBackgroundImage(PreviewView.getBackgroundDrawable(null, currentAccount, dialogId, Theme.isCurrentThemeDark()), false); + + final Drawable drawable = PreviewView.getBackgroundDrawable(null, currentAccount, dialogId, Theme.isCurrentThemeDark()); + chatView.setBackgroundImage(drawable, false); + Integer color = null; + BlurredBackgroundSourceColor sourceColor = new BlurredBackgroundSourceColor(); + if (drawable instanceof ColorDrawable) { + color = ((ColorDrawable) drawable).getColor(); + } else if (drawable instanceof MotionBackgroundDrawable) { + if (((MotionBackgroundDrawable) drawable).getIntensity() < 0) { + color = Color.BLACK; + } else { + int[] colors = ((MotionBackgroundDrawable) drawable).getColors(); + if (colors != null && colors.length > 0) { + color = colors[0]; + } + } + } + sourceColor.setColor(color != null ? color : getThemedColor(Theme.key_dialogBackground)); + BlurredBackgroundDrawable msgDrawable = sourceColor.createDrawable(); + msgDrawable.setColorProvider(new BlurredBackgroundColorProviderThemed(resourcesProvider, Theme.key_dialogBackground)); + msgDrawable.setRadius(dp(20)); + msgDrawable.setPadding(dp(4)); + chatLinearLayout = new LinearLayout(context); chatLinearLayout.setOrientation(LinearLayout.VERTICAL); @@ -279,6 +321,19 @@ public class SendGiftSheet extends BottomSheetWithRecyclerListView implements No chatView.addView(chatLinearLayout, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT, Gravity.FILL)); messageEdit = new EditEmojiTextCell(context, (SizeNotifierFrameLayout) containerView, getString(starGift != null ? R.string.Gift2Message : R.string.Gift2MessageOptional), true, MessagesController.getInstance(currentAccount).stargiftsMessageLengthMax, EditTextEmoji.STYLE_GIFT, resourcesProvider) { + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + setPadding(dp(16), 0, dp(12), 0); + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + } + + @Override + protected void dispatchDraw(@NonNull Canvas canvas) { + msgDrawable.setBounds(dp(10), 0, getMeasuredWidth() - dp(10), getMeasuredHeight()); + msgDrawable.draw(canvas); + super.dispatchDraw(canvas); + } + @Override protected void onTextChanged(CharSequence newText) { TLRPC.TL_textWithEntities txt; @@ -310,7 +365,7 @@ public class SendGiftSheet extends BottomSheetWithRecyclerListView implements No messageEdit.setShowLimitWhenNear(50); setEditTextEmoji(messageEdit.editTextEmoji); messageEdit.setShowLimitOnFocus(true); - messageEdit.setBackgroundColor(Theme.getColor(Theme.key_dialogBackground, resourcesProvider)); + messageEdit.setDivider(false); messageEdit.hideKeyboardOnEnter(); messageEdit.setPadding(backgroundPaddingLeft, 0, backgroundPaddingLeft, 0); @@ -327,7 +382,6 @@ public class SendGiftSheet extends BottomSheetWithRecyclerListView implements No itemAnimator.setInterpolator(CubicBezierInterpolator.EASE_OUT_QUINT); itemAnimator.setDelayIncrement(40); recyclerListView.setItemAnimator(itemAnimator); - recyclerListView.setPadding(backgroundPaddingLeft, 0, backgroundPaddingLeft, dp(48 + 10 + 10 + (starGift != null && starGift.limited ? 30 + 10 : 0))); adapter.update(false); buttonContainer = new LinearLayout(context); @@ -342,9 +396,17 @@ public class SendGiftSheet extends BottomSheetWithRecyclerListView implements No final float limitedProgress = Utilities.clamp(starGift == null ? 0 : (float) starGift.availability_remains / starGift.availability_total, 1f, 0); limitContainer = new FrameLayout(context); - limitContainer.setVisibility(starGift != null && starGift.limited ? View.VISIBLE : View.GONE); limitContainer.setBackground(Theme.createRoundRectDrawable(dp(6), Theme.getColor(Theme.key_windowBackgroundGray, resourcesProvider))); - buttonContainer.addView(limitContainer, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 30, 10, 10, 10, 0)); + + if (starGift != null && starGift.auction) { + limitContainerWrapper = new FrameLayout(context); + limitContainerWrapper.addView(limitContainer, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 30, 10, 14, 10, 14)); + limitContainerWrapper.setBackgroundColor(Theme.getColor(Theme.key_dialogBackground, resourcesProvider)); + } else { + limitContainer.setVisibility(starGift != null && starGift.limited ? View.VISIBLE : View.GONE); + buttonContainer.addView(limitContainer, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 30, 10, 10, 10, 0)); + limitContainerWrapper = null; + } leftTextView = new TextView(context); leftTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 13); @@ -448,6 +510,29 @@ public class SendGiftSheet extends BottomSheetWithRecyclerListView implements No adapter.update(false); layoutManager.scrollToPositionWithOffset(adapter.getItemCount(), dp(200)); + recyclerListView.setPadding(backgroundPaddingLeft, 0, backgroundPaddingLeft, dp(48 + 10 + 10 + (starGift != null && starGift.limited && limitContainerWrapper == null ? 30 + 10 : 0))); + recyclerListView.addItemDecoration(new RecyclerView.ItemDecoration() { + final PointF p = new PointF(); + + @Override + public void onDraw(@NonNull Canvas c, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { + ViewPositionWatcher.computeCoordinatesInParent(chatView, recyclerListView, p); + final int top = (int) p.y; + final int left = (int) p.x; + final int bottom = (int) ViewPositionWatcher.computeYCoordinateInParent(messageEdit, recyclerListView) + messageEdit.getMeasuredHeight() + dp(12); + + if (top < bottom && chatView.backgroundView != null) { + final float s = (float) (bottom - top) / chatView.backgroundView.getHeight(); + c.save(); + c.clipRect(0, top, parent.getWidth(), bottom); + c.translate(left, top); + c.scale(s, s); + chatView.backgroundView.draw(c); + c.restore(); + } + super.onDraw(c, parent, state); + } + }); recyclerListView.setOnItemClickListener((view, position) -> { final UItem item = adapter.getItem(reverseLayout ? position : position - 1); if (item == null) return; @@ -623,6 +708,12 @@ public class SendGiftSheet extends BottomSheetWithRecyclerListView implements No ); } + @Override + public void onOpenAnimationEnd() { + super.onOpenAnimationEnd(); + recyclerListView.invalidateItemDecorations(); + } + private void buyPremiumTier() { final TLRPC.User user = MessagesController.getInstance(currentAccount).getUser(dialogId); if (user == null) { @@ -813,6 +904,7 @@ public class SendGiftSheet extends BottomSheetWithRecyclerListView implements No items.add(UItem.asCustom(-1, chatView)); if (paidMessagesStarsPrice <= 0) { items.add(UItem.asCustom(-2, messageEdit)); + items.add(UItem.asSpace(dp(12))); } if (starGift != null) { if (starGift.can_upgrade && !self) { @@ -827,6 +919,13 @@ public class SendGiftSheet extends BottomSheetWithRecyclerListView implements No } items.add(UItem.asCheck(1, getString(self ? R.string.Gift2HideSelf : R.string.Gift2Hide)).setChecked(anonymous)); items.add(UItem.asShadow(-6, self ? getString(R.string.Gift2HideSelfInfo) : dialogId < 0 ? getString(R.string.Gift2HideChannelInfo) : formatString(R.string.Gift2HideInfo, name))); + + if (limitContainerWrapper != null) { + final CharSequence s = AndroidUtilities.replaceArrows(AndroidUtilities.replaceSingleTag(formatPluralString("Gift2AuctionInfoLearnMore2", starGift.gifts_per_round, starGift.gifts_per_round), + () -> AuctionJoinSheet.showMoreInfo(getContext(), resourcesProvider, starGift)), true); + items.add(UItem.asCustom(-43, limitContainerWrapper)); + items.add(UItem.asShadow(-44, s)); + } } else { if (paidMessagesStarsPrice <= 0) { items.add(UItem.asShadow(-3, formatString(R.string.Gift2MessagePremiumInfo, name))); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ReadAllMentionsMenu.java b/TMessagesProj/src/main/java/org/telegram/ui/ReadAllMentionsMenu.java index de7448537..31dfa2112 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ReadAllMentionsMenu.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ReadAllMentionsMenu.java @@ -1,6 +1,7 @@ package org.telegram.ui; import android.app.Activity; +import android.graphics.PointF; import android.view.Gravity; import android.view.View; import android.view.WindowManager; @@ -14,6 +15,7 @@ import org.telegram.ui.ActionBar.ActionBarPopupWindow; import org.telegram.ui.ActionBar.INavigationLayout; import org.telegram.ui.ActionBar.Theme; import org.telegram.ui.Components.LayoutHelper; +import org.telegram.ui.Components.chat.ViewPositionWatcher; public class ReadAllMentionsMenu { @@ -46,8 +48,11 @@ public class ReadAllMentionsMenu { scrimPopupWindow.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED); scrimPopupWindow.getContentView().setFocusableInTouchMode(true); - float x = mentionButton.getX() + mentionButton.getWidth() - popupWindowLayout.getMeasuredWidth() + AndroidUtilities.dp(8); - float y = mentionButton.getY() - popupWindowLayout.getMeasuredHeight(); + PointF pf = new PointF(); + ViewPositionWatcher.computeCoordinatesInParent(mentionButton, contentView, pf); + + float x = pf.x + mentionButton.getWidth() - popupWindowLayout.getMeasuredWidth() + AndroidUtilities.dp(8); + float y = pf.y - popupWindowLayout.getMeasuredHeight(); if (AndroidUtilities.isTablet()) { View v = navigationLayout.getView(); x += v.getX() + v.getPaddingLeft(); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Stars/StarGiftSheet.java b/TMessagesProj/src/main/java/org/telegram/ui/Stars/StarGiftSheet.java index cee294da4..a73633233 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Stars/StarGiftSheet.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Stars/StarGiftSheet.java @@ -4286,6 +4286,7 @@ public class StarGiftSheet extends BottomSheetWithRecyclerListView implements No final boolean self = messageObject.getDialogId() == selfId; TL_stars.StarGift stargift; TLRPC.TL_textWithEntities message; + TLRPC.Peer auctionPeer = null; if (messageObject.messageOwner.action instanceof TLRPC.TL_messageActionStarGift || messageObject.messageOwner.action instanceof TLRPC.TL_messageActionStarGiftUnique && ((TLRPC.TL_messageActionStarGiftUnique) messageObject.messageOwner.action).gift instanceof TL_stars.TL_starGift) { if (!rolling && roller != null && roller.isRolling() && roller.rollingGift != null) { roller.detach(); @@ -4303,7 +4304,6 @@ public class StarGiftSheet extends BottomSheetWithRecyclerListView implements No long convert_stars, upgrade_stars; TLRPC.Peer from_id, peer; String prepaid_upgrade_hash; - TLRPC.Peer auctionPeer = null; if (messageObject.messageOwner.action instanceof TLRPC.TL_messageActionStarGift) { final TLRPC.TL_messageActionStarGift action = (TLRPC.TL_messageActionStarGift) messageObject.messageOwner.action; converted = action.converted; @@ -4551,7 +4551,7 @@ public class StarGiftSheet extends BottomSheetWithRecyclerListView implements No afterTableTextView.setText(AndroidUtilities.replaceArrows(AndroidUtilities.replaceSingleTag(getString(R.string.Gift2InBlockchain), () -> { Browser.openUrlInSystemBrowser(getContext(), MessagesController.getInstance(currentAccount).tonBlockchainExplorerUrl + gift_address); }), true, dp(8f / 3f), dp(.66f))); - } else if (!converted && !refunded && stargift != null && isMine(currentAccount, getDialogId())) { + } else if (!converted && !refunded && stargift != null && isMine(currentAccount, getDialogId()) && auctionPeer == null) { afterTableTextView.setVisibility(View.VISIBLE); if (getDialogId() >= 0) { final SpannableStringBuilder sb = new SpannableStringBuilder(); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Stories/PeerStoriesView.java b/TMessagesProj/src/main/java/org/telegram/ui/Stories/PeerStoriesView.java index 59bda8831..721e14656 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Stories/PeerStoriesView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Stories/PeerStoriesView.java @@ -4839,18 +4839,18 @@ public class PeerStoriesView extends SizeNotifierFrameLayout implements Notifica stealthModeIsActive = false; chatActivityEnterView.setEnabled(true); chatActivityEnterView.setOverrideHint(StarsIntroActivity.replaceStars(LocaleController.formatString(R.string.TypeMessageForStars, LocaleController.formatNumber(starsPriceBlocked, ','))), animated); - } else if (stealthMode != null && ConnectionsManager.getInstance(currentAccount).getCurrentTime() < stealthMode.active_until_date) { + } else if (!currentStory.isLive && stealthMode != null && ConnectionsManager.getInstance(currentAccount).getCurrentTime() < stealthMode.active_until_date) { stealthModeIsActive = true; int time = stealthMode.active_until_date - ConnectionsManager.getInstance(currentAccount).getCurrentTime(); int minutes = time / 60; int seconds = time % 60; - String textToMeasure = LocaleController.formatString("StealthModeActiveHint", R.string.StealthModeActiveHintShort, String.format(Locale.US, "%02d:%02d", 99, 99)); + String textToMeasure = LocaleController.formatString(R.string.StealthModeActiveHintShort, String.format(Locale.US, "%02d:%02d", 99, 99)); int w = (int) chatActivityEnterView.getEditField().getPaint().measureText(textToMeasure); chatActivityEnterView.setEnabled(true); if (w * 1.2f >= chatActivityEnterView.getEditField().getMeasuredWidth()) { - chatActivityEnterView.setOverrideHint(LocaleController.formatString("StealthModeActiveHintShort", R.string.StealthModeActiveHintShort, ""), String.format(Locale.US, "%02d:%02d", minutes, seconds), animated); + chatActivityEnterView.setOverrideHint(LocaleController.formatString(R.string.StealthModeActiveHintShort, ""), String.format(Locale.US, "%02d:%02d", minutes, seconds), animated); } else { - chatActivityEnterView.setOverrideHint(LocaleController.formatString("StealthModeActiveHint", R.string.StealthModeActiveHint, String.format(Locale.US, "%02d:%02d", minutes, seconds)), animated); + chatActivityEnterView.setOverrideHint(LocaleController.formatString(R.string.StealthModeActiveHint, String.format(Locale.US, "%02d:%02d", minutes, seconds)), animated); } AndroidUtilities.runOnUIThread(updateStealthModeTimer, 1000); } else { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Stories/StoryMediaAreasView.java b/TMessagesProj/src/main/java/org/telegram/ui/Stories/StoryMediaAreasView.java index 067dc369c..545c5a4bb 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Stories/StoryMediaAreasView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Stories/StoryMediaAreasView.java @@ -527,7 +527,7 @@ public class StoryMediaAreasView extends FrameLayout implements View.OnClickList canvas.scale(s, s, rectF.centerX(), rectF.centerY()); canvas.rotate(lastSelectedArea.getRotation(), rectF.centerX(), rectF.centerY()); final float r = (lastSelectedArea.mediaArea.coordinates.flags & 1) != 0 ? - (float) (lastSelectedArea.mediaArea.coordinates.radius / 100.0 * getWidth()) : + (float) (lastSelectedArea.mediaArea.coordinates.radius / 100.0 * lastSelectedArea.getMeasuredWidth()) : .2f * lastSelectedArea.getMeasuredHeight(); clipPath.addRoundRect(rectF, r, r, Path.Direction.CW); canvas.clipPath(clipPath); @@ -733,7 +733,7 @@ public class StoryMediaAreasView extends FrameLayout implements View.OnClickList public float getInnerRadius() { if (getParent() instanceof View && mediaArea != null && mediaArea.coordinates != null) { return (mediaArea.coordinates.flags & 1) != 0 ? - (float) (mediaArea.coordinates.radius / 100.0 * ((View) getParent()).getWidth() / getScaleX()) : + (float) (mediaArea.coordinates.radius / 100.0 * getWidth() / getScaleX()) : .2f * getMeasuredHeight(); } else { return .2f * getMeasuredHeight(); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Stories/recorder/PaintView.java b/TMessagesProj/src/main/java/org/telegram/ui/Stories/recorder/PaintView.java index 6de303515..0b542d295 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Stories/recorder/PaintView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Stories/recorder/PaintView.java @@ -3069,7 +3069,7 @@ public class PaintView extends SizeNotifierFrameLayoutPhoto implements IPhotoPai } if (mediaEntity.mediaArea != null && mediaEntity.mediaArea.coordinates != null && radius > 0) { mediaEntity.mediaArea.coordinates.flags |= 1; - mediaEntity.mediaArea.coordinates.radius = (scaleX * radius / (float) entitiesView.getMeasuredWidth()) * 100; + mediaEntity.mediaArea.coordinates.radius = (scaleX * radius / v.getWidth()) * 100; } } if (drawThisEntity && (drawEntities || drawMessage && mediaEntity.type == VideoEditedInfo.MediaEntity.TYPE_MESSAGE) && bitmap != null) { diff --git a/TMessagesProj/src/main/res/values/strings.xml b/TMessagesProj/src/main/res/values/strings.xml index a6d83a51e..39a1c1738 100644 --- a/TMessagesProj/src/main/res/values/strings.xml +++ b/TMessagesProj/src/main/res/values/strings.xml @@ -8584,6 +8584,8 @@ Hide my name and message from visitors to my profile %d gift is dropped at varying intervals to the top %d bidder by bid amount. %d gifts are dropped at varying intervals to the top %d bidders by bid amount. + %d gift is dropped at varying intervals to the top %d bidder by bid amount. **Learn More >** + %d gifts are dropped at varying intervals to the top %d bidders by bid amount. **Learn More >** Top **%d** bidder will get an **%s**\nthis round. Top **%d** bidders will get an **%s**\nthis round. Started @@ -10007,6 +10009,10 @@ 2nd place 3rd place %d place + %dst place + %dnd place + %drd place + %dth place You are winning all of them. You\'ve been outbid. diff --git a/gradle.properties b/gradle.properties index 2e2445e89..c294480c2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,8 +13,8 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true #Sat Mar 12 05:53:50 MSK 2016 -APP_VERSION_CODE=6298 -APP_VERSION_NAME=12.2.3 +APP_VERSION_CODE=6304 +APP_VERSION_NAME=12.2.4 APP_PACKAGE=org.telegram.messenger IS_PRIVATE=false RELEASE_KEY_PASSWORD=android