cenochallenge/ReadYou
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add GitHub and F-droid flavors (#59)

Browse Source
This commit is contained in:
Ashinch 2022-05-10 22:38:57 +08:00 committed by GitHub
parent f2571f133e
commit 81fdcb498d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/build.gradle
View File

@ -29,6 +29,16 @@ android {
useSupportLibrary true useSupportLibrary true
} }
} }
flavorDimensions "channel"
productFlavors {
fdroid {
dimension "channel"
}
github {
dimension "channel"
}
}
signingConfigs { signingConfigs {
release { release {
keyAlias keyProps["keyAlias"] keyAlias keyProps["keyAlias"]

4
app/src/main/java/me/ash/reader/App.kt
View File

@ -73,7 +73,9 @@ class App : Application(), Configuration.Provider {
applicationScope.launch(dispatcherDefault) { applicationScope.launch(dispatcherDefault) {
accountInit() accountInit()
workerInit() workerInit()
checkUpdate() if (BuildConfig.FLAVOR != "fdroid") {
checkUpdate()
}
} }
} }

33
app/src/main/java/me/ash/reader/ui/page/settings/tips/TipsAndSupport.kt
View File

@ -35,7 +35,6 @@ import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
import kotlinx.coroutines.launch
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.ui.component.CurlyCornerShape import me.ash.reader.ui.component.CurlyCornerShape
import me.ash.reader.ui.component.FeedbackIconButton import me.ash.reader.ui.component.FeedbackIconButton
@ -118,26 +117,24 @@ fun TipsAndSupport(
onTap = { onTap = {
if (System.currentTimeMillis() - clickTime > 2000) { if (System.currentTimeMillis() - clickTime > 2000) {
clickTime = System.currentTimeMillis() clickTime = System.currentTimeMillis()
context.showToast(context.getString(R.string.checking_updates)) updateViewModel.dispatch(
scope.launch { UpdateViewAction.CheckUpdate(
updateViewModel.dispatch( {
UpdateViewAction.CheckUpdate( context.showToast(context.getString(R.string.checking_updates))
{ context.dataStore.put(
context.dataStore.put( DataStoreKeys.SkipVersionNumber,
DataStoreKeys.SkipVersionNumber, ""
"" )
},
{
if (!it) {
context.showToast(
context.getString(R.string.is_latest_version)
) )
},
{
if (!it) {
context.showToast(
context.getString(R.string.is_latest_version)
)
}
} }
) }
) )
} )
} else { } else {
clickTime = System.currentTimeMillis() clickTime = System.currentTimeMillis()
} }

15
app/src/main/java/me/ash/reader/ui/page/settings/tips/UpdateViewModel.kt
View File

@ -5,6 +5,7 @@ import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.* import kotlinx.coroutines.flow.*
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import me.ash.reader.BuildConfig
import me.ash.reader.data.repository.AppRepository import me.ash.reader.data.repository.AppRepository
import me.ash.reader.data.source.Download import me.ash.reader.data.source.Download
import javax.inject.Inject import javax.inject.Inject
@ -32,12 +33,14 @@ class UpdateViewModel @Inject constructor(
preProcessor: suspend () -> Unit = {}, preProcessor: suspend () -> Unit = {},
postProcessor: suspend (Boolean) -> Unit = {} postProcessor: suspend (Boolean) -> Unit = {}
) { ) {
viewModelScope.launch { if (BuildConfig.FLAVOR != "fdroid") {
preProcessor() viewModelScope.launch {
appRepository.checkUpdate().let { preProcessor()
it?.let { appRepository.checkUpdate().let {
changeUpdateDialogVisible(it) it?.let {
postProcessor(it) changeUpdateDialogVisible(it)
postProcessor(it)
}
} }
} }
} }