From 3e36e548f95dc97e3a82b2ece693ac5bf0c71cef Mon Sep 17 00:00:00 2001 From: xtaodada Date: Sun, 18 Feb 2024 12:08:55 +0800 Subject: [PATCH] perf: remove mini flag --- .github/workflows/debug.yml | 8 ++++---- .github/workflows/release.yml | 8 ++++---- TMessagesProj/build.gradle | 7 ++++++- TMessagesProj/src/main/AndroidManifest.xml | 14 -------------- .../main/java/org/telegram/ui/ProfileActivity.java | 12 ++++++------ 5 files changed, 20 insertions(+), 29 deletions(-) diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index f3983eedaf..48779bf21e 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -348,12 +348,12 @@ jobs: curl http://127.0.0.1:8081/ || start curl http://127.0.0.1:8081/ || start # send release via telegram bot api - export mini64=$(find artifacts -name "*mini-arm64-v8a.apk") - export mini32=$(find artifacts -name "*mini-armeabi-v7a.apk") + export mini64=$(find artifacts -name "*arm64-v8a.apk") + export mini32=$(find artifacts -name "*armeabi-v7a.apk") # export full64=$(find artifacts -name "*full-arm64-v8a.apk") # export full32=$(find artifacts -name "*full-armeabi-v7a.apk") - export mini64nogcm=$(find artifacts -name "*mini-arm64-v8aNoGcm.apk") - export mini32nogcm=$(find artifacts -name "*mini-armeabi-v7aNoGcm.apk") + export mini64nogcm=$(find artifacts -name "*arm64-v8aNoGcm.apk") + export mini32nogcm=$(find artifacts -name "*armeabi-v7aNoGcm.apk") # export full64nogcm=$(find artifacts -name "*full-arm64-v8aNoGcm.apk") # export full32nogcm=$(find artifacts -name "*full-armeabi-v7aNoGcm.apk") diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6c878b0587..ffc48e2861 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -266,12 +266,12 @@ jobs: curl http://127.0.0.1:8081/ || start curl http://127.0.0.1:8081/ || start # send release via telegram bot api - export mini64=$(find artifacts -name "*mini-arm64-v8a.apk") - export mini32=$(find artifacts -name "*mini-armeabi-v7a.apk") + export mini64=$(find artifacts -name "*arm64-v8a.apk") + export mini32=$(find artifacts -name "*armeabi-v7a.apk") # export full64=$(find artifacts -name "*full-arm64-v8a.apk") # export full32=$(find artifacts -name "*full-armeabi-v7a.apk") - export mini64nogcm=$(find artifacts -name "*mini-arm64-v8aNoGcm.apk") - export mini32nogcm=$(find artifacts -name "*mini-armeabi-v7aNoGcm.apk") + export mini64nogcm=$(find artifacts -name "*arm64-v8aNoGcm.apk") + export mini32nogcm=$(find artifacts -name "*armeabi-v7aNoGcm.apk") # export full64nogcm=$(find artifacts -name "*full-arm64-v8aNoGcm.apk") # export full32nogcm=$(find artifacts -name "*full-armeabi-v7aNoGcm.apk") diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index 862ffdc8e6..a7d17f1681 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -307,7 +307,12 @@ android { applicationVariants.all { variant -> variant.outputs.all { output -> - outputFileName = outputFileName.replace("TMessagesProj", "Nagram-v" + versionName).replace("-release", "") + String gramName = "Nagram" + String first = String.format("%s-v%s(%s)", gramName, versionName, versionCode) + String name = outputFileName.replace("TMessagesProj", first) + name = name.replace("-release", "") + name = name.replace("-mini", "") + outputFileName = name } } diff --git a/TMessagesProj/src/main/AndroidManifest.xml b/TMessagesProj/src/main/AndroidManifest.xml index 4ab6fc1fcf..6e23afea2d 100644 --- a/TMessagesProj/src/main/AndroidManifest.xml +++ b/TMessagesProj/src/main/AndroidManifest.xml @@ -385,20 +385,6 @@ - - - - - - - - - - - - - - diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java index 51aba77490..ccb34f610d 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java @@ -3942,11 +3942,11 @@ public void openExceptions() { switchBuilder.doRadioCheck(radioButtonCell); return Unit.INSTANCE; }); - switchBuilder.addRadioItem(LocaleController.getString("AutoCheckUpdatePreview", R.string.AutoCheckUpdatePreview), NekoXConfig.autoUpdateReleaseChannel == 3, (radioButtonCell) -> { - NekoXConfig.setAutoUpdateReleaseChannel(3); - switchBuilder.doRadioCheck(radioButtonCell); - return Unit.INSTANCE; - }); +// switchBuilder.addRadioItem(LocaleController.getString("AutoCheckUpdatePreview", R.string.AutoCheckUpdatePreview), NekoXConfig.autoUpdateReleaseChannel == 3, (radioButtonCell) -> { +// NekoXConfig.setAutoUpdateReleaseChannel(3); +// switchBuilder.doRadioCheck(radioButtonCell); +// return Unit.INSTANCE; +// }); showDialog(switchBuilder.create()); return Unit.INSTANCE; }); @@ -10592,7 +10592,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { cell.getTextView().setMovementMethod(null); cell.setBackground(Theme.getThemedDrawable(mContext, R.drawable.greydivider_bottom, Theme.key_windowBackgroundGrayShadow)); - cell.setText("Nagram v" + BuildConfig.VERSION_NAME + "(" + BuildConfig.VERSION_CODE + ") " + Build.SUPPORTED_ABIS[0].toLowerCase(Locale.ROOT) + " " + BuildConfig.FLAVOR + " " + BuildConfig.BUILD_TYPE); + cell.setText("Nagram v" + BuildConfig.VERSION_NAME + "(" + BuildConfig.VERSION_CODE + ") " + Build.SUPPORTED_ABIS[0].toLowerCase(Locale.ROOT) + " " + BuildConfig.BUILD_TYPE); cell.getTextView().setPadding(0, AndroidUtilities.dp(14), 0, AndroidUtilities.dp(14)); view = cell;