diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index 06abfc6d4..538ff18b9 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -def verName = "7.3.1-rc09" -def verCode = 148 +def verName = "7.3.1-rc11" +def verCode = 152 def serviceAccountCredentialsFile = rootProject.file("service_account_credentials.json") diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java index 7ebce4516..605b498fc 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java @@ -186,17 +186,15 @@ public class ActionBar extends FrameLayout { Drawable drawable = Theme.getCurrentHolidayDrawable(); if (drawable != null && drawable.getBounds().contains((int) ev.getX(), (int) ev.getY())) { manualStart = true; - if (snowflakesEffect == null) { - fireworksEffect = null; - snowflakesEffect = new SnowflakesEffect(); - titleTextView[0].invalidate(); - invalidate(); - } else { + if (snowflakesEffect != null) { snowflakesEffect = null; fireworksEffect = new FireworksEffect(); - titleTextView[0].invalidate(); - invalidate(); + } else { + fireworksEffect = null; + snowflakesEffect = new SnowflakesEffect(); } + titleTextView[0].invalidate(); + invalidate(); } } return super.onInterceptTouchEvent(ev); @@ -234,27 +232,27 @@ public class ActionBar extends FrameLayout { invalidate(); } } - if (NekoConfig.actionBarDecoration == 2) { - if (fireworksEffect == null) { - fireworksEffect = new FireworksEffect(); - } - } else if (Theme.canStartHolidayAnimation()) { - if (snowflakesEffect == null) { - snowflakesEffect = new SnowflakesEffect(); - } - } else if (!manualStart) { - if (snowflakesEffect != null) { - snowflakesEffect = null; - } - if (fireworksEffect != null) { - fireworksEffect = null; - } + } + if (NekoConfig.actionBarDecoration == 2) { + if (fireworksEffect == null) { + fireworksEffect = new FireworksEffect(); } + } else if (NekoConfig.actionBarDecoration == 1 || Theme.canStartHolidayAnimation()) { + if (snowflakesEffect == null) { + snowflakesEffect = new SnowflakesEffect(); + } + } else if (!manualStart) { if (snowflakesEffect != null) { - snowflakesEffect.onDraw(this, canvas); - } else if (fireworksEffect != null) { - fireworksEffect.onDraw(this, canvas); + snowflakesEffect = null; } + if (fireworksEffect != null) { + fireworksEffect = null; + } + } + if (snowflakesEffect != null) { + snowflakesEffect.onDraw(this, canvas); + } else if (fireworksEffect != null) { + fireworksEffect.onDraw(this, canvas); } } if (clip) { 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 f16915aea..7d5975f81 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java @@ -4583,7 +4583,7 @@ public class Theme { public static Drawable getCurrentHolidayDrawable() { if ((System.currentTimeMillis() - lastHolidayCheckTime) >= 60 * 1000) { lastHolidayCheckTime = System.currentTimeMillis(); - if (getEventType() == 0 || NekoConfig.actionBarDecoration == 1) { + if (getEventType() == 0) { canStartHolidayAnimation = true; } else { canStartHolidayAnimation = false; diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/VmessLoader.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/VmessLoader.kt index 400fc9e46..bb59cf6b9 100644 --- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/VmessLoader.kt +++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/VmessLoader.kt @@ -21,7 +21,7 @@ import kotlin.random.Random class VmessLoader { - private val point = Libv2ray.newV2RayPoint(EmptyCallback(), true) + private val point = Libv2ray.newV2RayPoint(EmptyCallback(), false) companion object { diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/cc/CCConverter.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/cc/CCConverter.kt index f4f5803d6..ffcab9741 100644 --- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/cc/CCConverter.kt +++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/cc/CCConverter.kt @@ -62,6 +62,7 @@ class CCConverter(val target: CCTarget) { CCDict.JPVariantsRev, CCDict.HKVariantsRev, CCDict.HKVariantsRevPhrases, + CCDict.TWVariantsRev, CCDict.TWPhrasesRev, CCDict.TWVariantsRevPhrases ))