From d6c0b653f07871f323ea49744c020a717f9d37c3 Mon Sep 17 00:00:00 2001 From: Ash Date: Mon, 22 Jan 2024 12:51:05 +0800 Subject: [PATCH] build(variant): add google play --- .github/workflows/build_commit.yaml | 4 -- .github/workflows/build_pull_request.yaml | 24 -------- app/build.gradle | 4 ++ app/src/googlePlay/AndroidManifest.xml | 55 ++++++++++++++++++ app/src/googlePlay/ic_launcher-playstore.png | Bin 0 -> 12686 bytes .../infrastructure/android/AndroidApp.kt | 4 +- .../java/me/ash/reader/ui/ext/FlavorExt.kt | 6 +- .../ui/page/settings/tips/UpdateViewModel.kt | 4 +- 8 files changed, 67 insertions(+), 34 deletions(-) delete mode 100644 .github/workflows/build_pull_request.yaml create mode 100644 app/src/googlePlay/AndroidManifest.xml create mode 100644 app/src/googlePlay/ic_launcher-playstore.png diff --git a/.github/workflows/build_commit.yaml b/.github/workflows/build_commit.yaml index 9e2cb2fe9..41c9064c5 100644 --- a/.github/workflows/build_commit.yaml +++ b/.github/workflows/build_commit.yaml @@ -18,7 +18,3 @@ jobs: with: name: github-${{ github.sha }} path: app/build/outputs/apk/github/release/*.apk - - uses: actions/upload-artifact@v3 - with: - name: fdroid-${{ github.sha }} - path: app/build/outputs/apk/fdroid/release/*.apk diff --git a/.github/workflows/build_pull_request.yaml b/.github/workflows/build_pull_request.yaml deleted file mode 100644 index 442423199..000000000 --- a/.github/workflows/build_pull_request.yaml +++ /dev/null @@ -1,24 +0,0 @@ -name: "Build Pull Request" -on: pull_request - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3.3.0 - - uses: actions/setup-java@v3.10.0 - with: - distribution: temurin - java-version: 17 - - - uses: gradle/gradle-build-action@v2.4.2 - - run: gradle assembleRelease - - - uses: actions/upload-artifact@v3.1.1 - with: - name: github-${{ github.sha }} - path: app/build/outputs/apk/github/release/*.apk - - uses: actions/upload-artifact@v3 - with: - name: fdroid-${{ github.sha }} - path: app/build/outputs/apk/fdroid/release/*.apk diff --git a/app/build.gradle b/app/build.gradle index 877c15dda..b245934a3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,6 +44,10 @@ android { fdroid { dimension "channel" } + googlePlay { + dimension "channel" + applicationIdSuffix ".google.play" + } github { dimension "channel" } diff --git a/app/src/googlePlay/AndroidManifest.xml b/app/src/googlePlay/AndroidManifest.xml new file mode 100644 index 000000000..625c9a7e3 --- /dev/null +++ b/app/src/googlePlay/AndroidManifest.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/googlePlay/ic_launcher-playstore.png b/app/src/googlePlay/ic_launcher-playstore.png new file mode 100644 index 0000000000000000000000000000000000000000..f3b8923541e4050d319c4ea42aa083c289a2eefa GIT binary patch literal 12686 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 literal 0 HcmV?d00001 diff --git a/app/src/main/java/me/ash/reader/infrastructure/android/AndroidApp.kt b/app/src/main/java/me/ash/reader/infrastructure/android/AndroidApp.kt index 82bfa2e00..703262bb3 100644 --- a/app/src/main/java/me/ash/reader/infrastructure/android/AndroidApp.kt +++ b/app/src/main/java/me/ash/reader/infrastructure/android/AndroidApp.kt @@ -19,7 +19,7 @@ import me.ash.reader.infrastructure.rss.OPMLDataSource import me.ash.reader.infrastructure.rss.RssHelper import me.ash.reader.ui.ext.del import me.ash.reader.ui.ext.getLatestApk -import me.ash.reader.ui.ext.isFdroid +import me.ash.reader.ui.ext.isGitHub import okhttp3.OkHttpClient import javax.inject.Inject @@ -132,7 +132,7 @@ class AndroidApp : Application(), Configuration.Provider { } private suspend fun checkUpdate() { - if (isFdroid) return + if (!isGitHub) return withContext(ioDispatcher) { applicationContext.getLatestApk().let { if (it.exists()) it.del() diff --git a/app/src/main/java/me/ash/reader/ui/ext/FlavorExt.kt b/app/src/main/java/me/ash/reader/ui/ext/FlavorExt.kt index 2a3e8b169..4a52fde27 100644 --- a/app/src/main/java/me/ash/reader/ui/ext/FlavorExt.kt +++ b/app/src/main/java/me/ash/reader/ui/ext/FlavorExt.kt @@ -6,6 +6,8 @@ import me.ash.reader.BuildConfig const val GITHUB = "github" const val FDROID = "fdroid" +const val GOOGLE_PLAY = "googlePlay" -const val isFdroid = BuildConfig.FLAVOR == FDROID -const val notFdroid = !isFdroid \ No newline at end of file +const val isFDroid = BuildConfig.FLAVOR == FDROID +const val isGitHub = BuildConfig.FLAVOR == GITHUB +const val isGooglePlay = BuildConfig.FLAVOR == GOOGLE_PLAY diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/tips/UpdateViewModel.kt b/app/src/main/java/me/ash/reader/ui/page/settings/tips/UpdateViewModel.kt index eac6addae..52cebce07 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/tips/UpdateViewModel.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/tips/UpdateViewModel.kt @@ -7,7 +7,7 @@ import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import me.ash.reader.domain.service.AppService import me.ash.reader.infrastructure.net.Download -import me.ash.reader.ui.ext.notFdroid +import me.ash.reader.ui.ext.isGitHub import javax.inject.Inject @HiltViewModel @@ -22,7 +22,7 @@ class UpdateViewModel @Inject constructor( preProcessor: suspend () -> Unit = {}, postProcessor: suspend (Boolean) -> Unit = {}, ) { - if (notFdroid) { + if (isGitHub) { viewModelScope.launch { preProcessor() appService.checkUpdate().let {