diff --git a/.github/workflows/build_commit.yaml b/.github/workflows/build_commit.yaml index 9e2cb2fe..2c821f31 100644 --- a/.github/workflows/build_commit.yaml +++ b/.github/workflows/build_commit.yaml @@ -16,9 +16,5 @@ jobs: - uses: actions/upload-artifact@v3.1.1 with: - name: github-${{ github.sha }} + name: ReadYou-GitHub-Build-${{ 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 44242319..00000000 --- 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 877c15dd..b245934a 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 00000000..625c9a7e --- /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 00000000..f3b89235 Binary files /dev/null and b/app/src/googlePlay/ic_launcher-playstore.png differ 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 82bfa2e0..703262bb 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 2a3e8b16..4a52fde2 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 eac6adda..52cebce0 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 {