From 555b88bdadd72ed4f9d1f0f8042f9ea0c5e6dcd3 Mon Sep 17 00:00:00 2001
From: mkx173 <zhw173@g.ucla.edu>
Date: Sat, 13 Apr 2024 18:18:17 -0700
Subject: [PATCH] chore: update version naming scheme

---
 app/build.gradle                                         | 9 +++++++--
 .../java/gm/tieba/tabswitch/hooker/TSPreference.java     | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2e4ffa03..cd5d2d3c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,6 +5,8 @@ plugins {
 }
 
 def gitCommitCount = Integer.parseInt('git rev-list --count HEAD'.execute([], project.rootDir).text.trim())
+def latestTag = String.valueOf('git describe --abbrev=0 --tags'.execute([], project.rootDir).text.trim())
+def commitCountSinceLatestTag = String.valueOf(('git rev-list --count ' + latestTag + '..HEAD').execute([], project.rootDir).text.trim())
 def sdk = 34
 
 android {
@@ -17,7 +19,10 @@ android {
         minSdk 28
         targetSdk sdk
         versionCode gitCommitCount
-        versionName '2.9.8'
+        versionName '2.9.9-beta'
+        if (versionName.contains('beta')) {
+            versionNameSuffix = '.' + commitCountSinceLatestTag
+        }
         buildConfigField "String", "TARGET_VERSION", "\"12.59.0.3\""
         buildConfigField "String", "MIN_VERSION", "\"12.53.1.0\""
 
@@ -31,7 +36,7 @@ android {
     }
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
-            outputFileName = "TS_${defaultConfig.versionName}_${defaultConfig.versionCode}-${variant.buildType.name}.apk"
+            outputFileName = "TS_${defaultConfig.versionName}${defaultConfig.versionNameSuffix ?: ''}_${variant.buildType.name}.apk"
         }
     }
     buildTypes {
diff --git a/app/src/main/java/gm/tieba/tabswitch/hooker/TSPreference.java b/app/src/main/java/gm/tieba/tabswitch/hooker/TSPreference.java
index e853e279..b23de1a4 100644
--- a/app/src/main/java/gm/tieba/tabswitch/hooker/TSPreference.java
+++ b/app/src/main/java/gm/tieba/tabswitch/hooker/TSPreference.java
@@ -153,7 +153,7 @@ private void proxyPage(final Activity activity, final NavigationBar navigationBa
     private void startRootPreferenceActivity(final Activity activity) {
         if (!Preferences.getIsEULAAccepted()) {
             final StringBuilder stringBuilder = new StringBuilder().append(Constants.getStrings().get("EULA"));
-            if (BuildConfig.VERSION_NAME.contains("alpha") || BuildConfig.VERSION_NAME.contains("beta")) {
+            if (BuildConfig.VERSION_NAME.contains("beta")) {
                 stringBuilder.append("\n\n").append(Constants.getStrings().get("dev_tip"));
             }
             AlertDialog alert = new AlertDialog.Builder(activity, DisplayUtils.isLightMode(getContext()) ?
@@ -275,7 +275,7 @@ private LinearLayout createRootPreference(final Activity activity) {
             intent.setData(Uri.parse("https://t.me/TabSwitch"));
             activity.startActivity(intent);
         }));
-        preferenceLayout.addView(TSPreferenceHelper.createButton("版本", String.format(Locale.CHINA, "%s_%d", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE), true, v -> {
+        preferenceLayout.addView(TSPreferenceHelper.createButton("版本", String.format(Locale.CHINA, "%s", BuildConfig.VERSION_NAME), true, v -> {
             final Intent intent = new Intent();
             intent.setAction("android.intent.action.VIEW");
             intent.setData(Uri.parse("https://github.com/GuhDoy/TiebaTS/releases"));