overspend1/Overgram4A
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to 9.1.5

Browse Source
This commit is contained in:
immat0x1
2022-11-22 00:50:32 +05:00
parent 1fb99ad282
commit 68372065fe
5 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@@ -1,11 +1,11 @@
FROM gradle:7.4.1-jdk11
ENV ANDROID_SDK_URL https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip
ENV ANDROID_API_LEVEL android-32
ENV ANDROID_BUILD_TOOLS_VERSION 32.1.0-rc1
ENV ANDROID_API_LEVEL android-33
ENV ANDROID_BUILD_TOOLS_VERSION 33.0.0
ENV ANDROID_HOME /usr/local/android-sdk-linux
ENV ANDROID_NDK_VERSION 21.4.7075529
ENV ANDROID_VERSION 32
ENV ANDROID_VERSION 33
ENV ANDROID_NDK_HOME ${ANDROID_HOME}/ndk/${ANDROID_NDK_VERSION}/
ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
@@ -22,8 +22,8 @@ RUN $ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=$ANDROID_HOME "build-t
"platforms;android-${ANDROID_VERSION}" \
"platform-tools" \
"ndk;$ANDROID_NDK_VERSION"
RUN cp $ANDROID_HOME/build-tools/30.0.3/dx $ANDROID_HOME/build-tools/31.0.0/dx
RUN cp $ANDROID_HOME/build-tools/30.0.3/lib/dx.jar $ANDROID_HOME/build-tools/31.0.0/lib/dx.jar
RUN cp $ANDROID_HOME/build-tools/30.0.3/dx $ANDROID_HOME/build-tools/33.0.0/dx
RUN cp $ANDROID_HOME/build-tools/30.0.3/lib/dx.jar $ANDROID_HOME/build-tools/33.0.0/lib/dx.jar
ENV PATH ${ANDROID_NDK_HOME}:$PATH
ENV PATH ${ANDROID_NDK_HOME}/prebuilt/linux-x86_64/bin/:$PATH
@@ -37,4 +37,4 @@ CMD mkdir -p /home/source/TMessagesProj/build/outputs/apk && \
gradle assembleAfatRelease && \
cp -R /home/gradle/TMessagesProj/build/outputs/apk/. /home/source/TMessagesProj/build/outputs/apk && \
cp -R /home/gradle/TMessagesProj/build/outputs/bundle/. /home/source/TMessagesProj/build/outputs/bundle && \
cp -R /home/gradle/TMessagesProj/build/outputs/native-debug-symbols/. /home/source/TMessagesProj/build/outputs/native-debug-symbols
cp -R /home/gradle/TMessagesProj/build/outputs/native-debug-symbols/. /home/source/TMessagesProj/build/outputs/native-debug-symbols

2
TMessagesProj/src/main/java/com/exteragram/messenger/components/StickerShapeCell.java
View File

@@ -85,7 +85,6 @@ public class StickerShapeCell extends LinearLayout {
}
int width = (int) Math.ceil(textPaint.measureText(text));
textPaint.setColor(Theme.getColor(Theme.key_windowBackgroundWhiteBlackText));
canvas.drawText(text, (getMeasuredWidth() - width) >> 1, AndroidUtilities.dp(102), textPaint);
rect.set(AndroidUtilities.dp(10), AndroidUtilities.dp(10), getMeasuredWidth() - AndroidUtilities.dp(10), AndroidUtilities.dp(70));
@@ -102,6 +101,7 @@ public class StickerShapeCell extends LinearLayout {
private void setProgress(float progress) {
this.progress = progress;
textPaint.setColor(ColorUtils.blendARGB(Theme.getColor(Theme.key_windowBackgroundWhiteBlackText), Theme.getColor(Theme.key_windowBackgroundWhiteValueText), progress));
outlinePaint.setColor(ColorUtils.blendARGB(ColorUtils.setAlphaComponent(Theme.getColor(Theme.key_switchTrack), 0x3F), Theme.getColor(Theme.key_windowBackgroundWhiteValueText), progress));
outlinePaint.setStrokeWidth(Math.max(2, AndroidUtilities.dp(AndroidUtilities.lerp(0.5f, 2f, progress))));
invalidate();

7
TMessagesProj/src/main/java/org/telegram/messenger/TopicsController.java
View File

@@ -81,10 +81,7 @@ public class TopicsController extends BaseController {
topicsIsLoading.put(chatId, 0);
processTopics(chatId, topics, null, fromCache, loadType, -1);
if (!endIsReached(chatId)) {
endIsReached.put(chatId, getUserConfig().getPreferences().getBoolean("topics_end_reached_" + chatId, false) ? 1 : 0);
}
sortTopics(chatId);
});
});
return;
@@ -121,7 +118,7 @@ public class TopicsController extends BaseController {
topicsIsLoading.put(chatId, 0);
processTopics(chatId, topics.topics, messagesMap, false, loadType, ((TLRPC.TL_messages_forumTopics) response).count);
getMessagesStorage().putMessages(topics.messages, false, true, false, 0, false, 0);
sortTopics(chatId);
getMessagesStorage().saveTopics(-chatId, topicsByChatId.get(chatId), true, true);
if (!topics.topics.isEmpty() && loadType == LOAD_TYPE_LOAD_NEXT) {

9
TMessagesProj/src/main/java/org/telegram/ui/TopicsFragment.java
View File

@@ -56,7 +56,6 @@ import org.telegram.messenger.NotificationsController;
import org.telegram.messenger.R;
import org.telegram.messenger.SharedConfig;
import org.telegram.messenger.TopicsController;
import org.telegram.messenger.UserConfig;
import org.telegram.messenger.Utilities;
import org.telegram.tgnet.ConnectionsManager;
import org.telegram.tgnet.TLObject;
@@ -73,10 +72,7 @@ import org.telegram.ui.ActionBar.Theme;
import org.telegram.ui.ActionBar.ThemeDescription;
import org.telegram.ui.Adapters.FiltersView;
import org.telegram.ui.Cells.DialogCell;
import org.telegram.ui.Cells.DrawerProfileCell;
import org.telegram.ui.Cells.GraySectionCell;
import org.telegram.ui.Cells.HeaderCell;
import org.telegram.ui.Cells.HintDialogCell;
import org.telegram.ui.Cells.ProfileSearchCell;
import org.telegram.ui.Cells.TopicSearchCell;
import org.telegram.ui.Cells.UserCell;
@@ -89,7 +85,6 @@ import org.telegram.ui.Components.ChatAvatarContainer;
import org.telegram.ui.Components.ChatNotificationsPopupWrapper;
import org.telegram.ui.Components.ColoredImageSpan;
import org.telegram.ui.Components.CubicBezierInterpolator;
import org.telegram.ui.Components.EditTextBoldCursor;
import org.telegram.ui.Components.FlickerLoadingView;
import org.telegram.ui.Components.Forum.ForumUtilities;
import org.telegram.ui.Components.FragmentContextView;
@@ -214,6 +209,7 @@ public class TopicsFragment extends BaseFragment implements NotificationCenter.N
private FrameLayout topView;
private RLottieImageView floatingButton;
private boolean canShowProgress;
public TopicsFragment(Bundle bundle) {
super(bundle);
@@ -221,6 +217,7 @@ public class TopicsFragment extends BaseFragment implements NotificationCenter.N
opnendForSelect = arguments.getBoolean("for_select", false);
openedForForward = arguments.getBoolean("forward_to", false);
topicsController = getMessagesController().getTopicsController();
canShowProgress = !getUserConfig().getPreferences().getBoolean("topics_end_reached_" + chatId, false);
}
public static void prepareToSwitchAnimation(ChatActivity chatActivity) {
@@ -1638,7 +1635,7 @@ public class TopicsFragment extends BaseFragment implements NotificationCenter.N
}
if (forumTopics.size() == 1 && forumTopics.get(0).topic.id == 1) {
forumTopics.clear();
} else if (!forumTopics.isEmpty() && !topicsController.endIsReached(chatId)) {
} else if (!forumTopics.isEmpty() && !topicsController.endIsReached(chatId) && canShowProgress) {
forumTopics.add(new Item(VIEW_TYPE_LOADING_CELL, null));
}

4
gradle.properties
View File

@@ -15,8 +15,8 @@ RELEASE_KEY_PASSWORD=***REMOVED***
RELEASE_KEY_ALIAS=exteraGram
RELEASE_STORE_PASSWORD=***REMOVED***
org.gradle.jvmargs=-Xmx4096M -XX:MaxPermSize=4096m -XX:+UseParallelGC -Dfile.encoding=UTF-8
APP_VERSION_NAME=9.1.4
APP_VERSION_CODE=2927
APP_VERSION_NAME=9.1.5
APP_VERSION_CODE=2928
APP_PACKAGE=com.exteragram.messenger
org.gradle.daemon=true
org.gradle.parallel=true