mirror of
https://github.com/FromGram/android.git
synced 2026-11-16 19:41:38 +03:00
update to 12.2.10 (6341)
This commit is contained in:
@@ -51,7 +51,7 @@ public class AppGlobalConfig {
|
||||
|
||||
public final ConfigInt passkeysAccountPasskeysMax = ofInt("passkeys_account_passkeys_max", 5);
|
||||
|
||||
public final ConfigBoolean settingsDisplayPasskeys = ofBoolean("settings_display_passkeys", false);
|
||||
public final ConfigBoolean settingsDisplayPasskeys = ofBoolean("settings_display_passkeys", BuildVars.DEBUG_VERSION ? true : false);
|
||||
|
||||
/* * */
|
||||
|
||||
|
||||
@@ -1213,6 +1213,8 @@ public class MessageObject {
|
||||
public boolean isDocuments;
|
||||
public boolean captionAbove;
|
||||
|
||||
public int cachedWidthForCaption = -1;
|
||||
|
||||
public GroupedMessagePosition getPosition(MessageObject msg) {
|
||||
if (msg == null) {
|
||||
return null;
|
||||
|
||||
@@ -2098,7 +2098,7 @@ public class ChatActionCell extends BaseCell implements DownloadController.FileD
|
||||
title = Emoji.replaceEmoji(title, giftTextPaint.getFontMetricsInt(), false, null);
|
||||
title = MessageObject.replaceAnimatedEmoji(title, action.message.entities, giftTextPaint.getFontMetricsInt());
|
||||
} else if (action.auction_acquired) {
|
||||
title = formatString(R.string.Gift2ActionWonActionText, formatNumber(action.gift.stars, ','));
|
||||
title = formatString(R.string.Gift2ActionWonActionText, formatNumber(action.gift.stars + action.upgrade_stars, ','));
|
||||
} else if (isForChannel) {
|
||||
if (action.converted) {
|
||||
title = formatPluralStringComma("Gift2ActionConvertedInfo", (int) stars);
|
||||
|
||||
@@ -9627,6 +9627,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
|
||||
}
|
||||
boolean checkCaption = true;
|
||||
if ((currentPosition.flags & captionFlag()) != 0 || captionAbove || currentMessagesGroup.hasSibling && (currentPosition.flags & MessageObject.POSITION_FLAG_TOP) == 0) {
|
||||
|
||||
if (currentPosition == null || (currentPosition.flags & captionFlag()) != 0) {
|
||||
widthForCaption += getAdditionalWidthForPosition(currentPosition);
|
||||
}
|
||||
@@ -9684,6 +9685,11 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((currentPosition.flags & MessageObject.POSITION_FLAG_LEFT) != 0 && currentCaption != null) {
|
||||
currentMessagesGroup.cachedWidthForCaption = widthForCaption;
|
||||
} else if (currentMessagesGroup.cachedWidthForCaption > 0) {
|
||||
widthForCaption = currentMessagesGroup.cachedWidthForCaption;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
photoHeight = h;
|
||||
|
||||
@@ -14,6 +14,8 @@ import android.graphics.ColorMatrixColorFilter;
|
||||
import android.graphics.Matrix;
|
||||
import android.graphics.Paint;
|
||||
import android.graphics.Path;
|
||||
import android.graphics.PorterDuff;
|
||||
import android.graphics.PorterDuffXfermode;
|
||||
import android.graphics.RectF;
|
||||
import android.graphics.RenderEffect;
|
||||
import android.graphics.RenderNode;
|
||||
@@ -161,16 +163,26 @@ public class ProfileGooeyView extends FrameLayout {
|
||||
private Bitmap bitmap;
|
||||
private Canvas bitmapCanvas;
|
||||
private final Paint bitmapPaint = new Paint();
|
||||
private final Paint bitmapPaint2 = new Paint();
|
||||
|
||||
private int optimizedH;
|
||||
private int optimizedW;
|
||||
|
||||
private int bitmapOrigW, bitmapOrigH;
|
||||
private final float scaleConst = 3f;
|
||||
private final float scaleConst = 5f;
|
||||
|
||||
{
|
||||
bitmapPaint.setFlags(Paint.FILTER_BITMAP_FLAG | Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG);
|
||||
bitmapPaint.setFilterBitmap(true);
|
||||
bitmapPaint2.setFlags(Paint.FILTER_BITMAP_FLAG | Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG);
|
||||
bitmapPaint2.setFilterBitmap(true);
|
||||
bitmapPaint2.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_ATOP));
|
||||
bitmapPaint.setColorFilter(new ColorMatrixColorFilter(new float[] {
|
||||
0f, 0f, 0f, 0f, 0f,
|
||||
0f, 0f, 0f, 0f, 0f,
|
||||
0f, 0f, 0f, 0f, 0f,
|
||||
0f, 0f, 0f, 60, -7500
|
||||
}));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -234,13 +246,15 @@ public class ProfileGooeyView extends FrameLayout {
|
||||
|
||||
// Blur buffer
|
||||
Utilities.stackBlurBitmap(bitmap, (int) (intensity * 2 / scaleConst));
|
||||
Utilities.applyAlphaThreshold(bitmap, 125);
|
||||
|
||||
// Filter alpha + fade, then draw
|
||||
canvas.save();
|
||||
canvas.translate(optimizedOffsetX, 0);
|
||||
canvas.saveLayer(0, 0, bitmapOrigW, bitmapOrigH, null);
|
||||
canvas.scale((float) bitmapOrigW / bitmap.getWidth(), (float) bitmapOrigH / bitmap.getHeight());
|
||||
canvas.drawBitmap(bitmap, 0, 0, bitmapPaint);
|
||||
canvas.drawBitmap(bitmap, 0, 0, bitmapPaint2);
|
||||
canvas.restore();
|
||||
canvas.restore();
|
||||
}
|
||||
|
||||
|
||||
@@ -252,7 +252,7 @@ public class AuctionWearingSheet extends BottomSheetWithRecyclerListView impleme
|
||||
};
|
||||
giftCell.setPriorityAuction();
|
||||
giftCell.setStarsGift(starGift, true, false, false, false);
|
||||
giftCell.setImageSize(dp(100));
|
||||
giftCell.setImageSize(dp(84));
|
||||
giftCell.setImageLayer(7);
|
||||
giftCell.hidePrice();
|
||||
giftCell.cardBackground.setStrokeColors(null);
|
||||
|
||||
@@ -1518,7 +1518,7 @@ public class GiftSheet extends BottomSheetWithRecyclerListView implements Notifi
|
||||
final TL_stars.starGiftAttributeBackdrop backdrop = findAttribute(gift.attributes, TL_stars.starGiftAttributeBackdrop.class);
|
||||
cardBackground.setBackdrop(backdrop);
|
||||
cardBackground.setPattern(findAttribute(gift.attributes, TL_stars.starGiftAttributePattern.class));
|
||||
if (gift.auction && (!gift.sold_out || priotityAuction)) {
|
||||
if (gift.auction && (!gift.sold_out || priotityAuction) && !(allowResaleInGifts && gift.availability_resale > 0)) {
|
||||
if (gift.sold_out) {
|
||||
cardBackground.setStrokeColors(new int[] {
|
||||
Theme.getColor(Theme.key_gift_ribbon_soldout, resourcesProvider),
|
||||
|
||||
@@ -3131,6 +3131,7 @@ public class LaunchActivity extends BasePermissionsActivity implements INavigati
|
||||
((ChatActivity) lastFragment).shakeContent();
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
new GiftSheet(this, intentAccount[0], peerId, null)
|
||||
|
||||
+2
-2
@@ -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=6337
|
||||
APP_VERSION_NAME=12.2.9
|
||||
APP_VERSION_CODE=6341
|
||||
APP_VERSION_NAME=12.2.10
|
||||
APP_PACKAGE=org.telegram.messenger
|
||||
IS_PRIVATE=false
|
||||
RELEASE_KEY_PASSWORD=android
|
||||
|
||||
Reference in New Issue
Block a user