add new preload variant
This commit is contained in:
@@ -113,7 +113,7 @@ android {
|
|||||||
flavorDimensions += "device"
|
flavorDimensions += "device"
|
||||||
|
|
||||||
productFlavors {
|
productFlavors {
|
||||||
create("vanilla"){
|
create("vanilla") {
|
||||||
dimension = "device"
|
dimension = "device"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -121,6 +121,12 @@ android {
|
|||||||
dimension = "device"
|
dimension = "device"
|
||||||
versionNameSuffix = "-hw"
|
versionNameSuffix = "-hw"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// This flavor is only for preloaded devices / users who push the app to system
|
||||||
|
create("preload") {
|
||||||
|
dimension = "device"
|
||||||
|
versionNameSuffix = "-preload"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
buildFeatures {
|
buildFeatures {
|
||||||
@@ -153,6 +159,15 @@ android {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
androidComponents {
|
||||||
|
beforeVariants(selector().all()) { variant ->
|
||||||
|
val flavour = variant.flavorName
|
||||||
|
if ((flavour == "huawei" || flavour == "preload") && variant.buildType == "nightly") {
|
||||||
|
variant.enable = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ksp {
|
ksp {
|
||||||
arg("room.schemaLocation", "$projectDir/schemas")
|
arg("room.schemaLocation", "$projectDir/schemas")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<lint>
|
<lint>
|
||||||
<issue id="MissingTranslation" severity="ignore" />
|
<issue id="MissingTranslation" severity="ignore" />
|
||||||
|
<issue id="ProtectedPermissions" severity="ignore" />
|
||||||
<issue id="QueryAllPackagesPermission" severity="ignore" />
|
<issue id="QueryAllPackagesPermission" severity="ignore" />
|
||||||
<issue id="ScopedStorage" severity="ignore" />
|
<issue id="ScopedStorage" severity="ignore" />
|
||||||
</lint>
|
</lint>
|
||||||
|
|||||||
7
app/src/huawei/AndroidManifest.xml
Normal file
7
app/src/huawei/AndroidManifest.xml
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
<uses-permission android:name="android.permission.INSTALL_PACKAGES" />
|
||||||
|
<uses-permission android:name="android.permission.DELETE_PACKAGES" />
|
||||||
|
</manifest>
|
||||||
7
app/src/preload/AndroidManifest.xml
Normal file
7
app/src/preload/AndroidManifest.xml
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
<uses-permission android:name="android.permission.INSTALL_PACKAGES" />
|
||||||
|
<uses-permission android:name="android.permission.DELETE_PACKAGES" />
|
||||||
|
</manifest>
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
/*
|
||||||
|
* Aurora Store
|
||||||
|
* Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
|
||||||
|
*
|
||||||
|
* Aurora Store is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Aurora Store is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with Aurora Store. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.aurora.store.view.ui.onboarding
|
||||||
|
|
||||||
|
import androidx.fragment.app.Fragment
|
||||||
|
import com.aurora.Constants
|
||||||
|
import com.aurora.store.util.Preferences.PREFERENCE_AUTO_DELETE
|
||||||
|
import com.aurora.store.util.Preferences.PREFERENCE_DEFAULT_SELECTED_TAB
|
||||||
|
import com.aurora.store.util.Preferences.PREFERENCE_DISPENSER_URLS
|
||||||
|
import com.aurora.store.util.Preferences.PREFERENCE_FILTER_AURORA_ONLY
|
||||||
|
import com.aurora.store.util.Preferences.PREFERENCE_FILTER_FDROID
|
||||||
|
import com.aurora.store.util.Preferences.PREFERENCE_FOR_YOU
|
||||||
|
import com.aurora.store.util.Preferences.PREFERENCE_INSTALLER_ID
|
||||||
|
import com.aurora.store.util.Preferences.PREFERENCE_SIMILAR
|
||||||
|
import com.aurora.store.util.Preferences.PREFERENCE_THEME_STYLE
|
||||||
|
import com.aurora.store.util.Preferences.PREFERENCE_UPDATES_CHECK_INTERVAL
|
||||||
|
import com.aurora.store.util.Preferences.PREFERENCE_UPDATES_EXTENDED
|
||||||
|
import com.aurora.store.util.Preferences.PREFERENCE_VENDING_VERSION
|
||||||
|
import com.aurora.store.util.save
|
||||||
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
|
|
||||||
|
@AndroidEntryPoint
|
||||||
|
class OnboardingFragment : BaseFlavouredOnboardingFragment() {
|
||||||
|
|
||||||
|
override fun loadDefaultPreferences() {
|
||||||
|
/*Filters*/
|
||||||
|
save(PREFERENCE_FILTER_AURORA_ONLY, false)
|
||||||
|
save(PREFERENCE_FILTER_FDROID, true)
|
||||||
|
|
||||||
|
/*Network*/
|
||||||
|
save(PREFERENCE_DISPENSER_URLS, setOf(Constants.URL_DISPENSER))
|
||||||
|
save(PREFERENCE_VENDING_VERSION, 0)
|
||||||
|
|
||||||
|
/*Customization*/
|
||||||
|
save(PREFERENCE_THEME_STYLE, 0)
|
||||||
|
save(PREFERENCE_DEFAULT_SELECTED_TAB, 0)
|
||||||
|
save(PREFERENCE_FOR_YOU, true)
|
||||||
|
save(PREFERENCE_SIMILAR, false)
|
||||||
|
|
||||||
|
/*Installer*/
|
||||||
|
save(PREFERENCE_AUTO_DELETE, true)
|
||||||
|
save(PREFERENCE_INSTALLER_ID, 0)
|
||||||
|
|
||||||
|
/*Updates*/
|
||||||
|
save(PREFERENCE_UPDATES_EXTENDED, false)
|
||||||
|
save(PREFERENCE_UPDATES_CHECK_INTERVAL, 3)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onboardingPages(): List<Fragment> {
|
||||||
|
return listOf(
|
||||||
|
WelcomeFragment(),
|
||||||
|
PermissionsFragment.newInstance()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun setupAutoUpdates() {
|
||||||
|
super.setupAutoUpdates()
|
||||||
|
|
||||||
|
// Remove super & implement variant logic here
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun finishOnboarding() {
|
||||||
|
super.finishOnboarding()
|
||||||
|
|
||||||
|
// Remove super & implement variant logic here
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
/*
|
||||||
|
* Aurora Store
|
||||||
|
* Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
|
||||||
|
*
|
||||||
|
* Aurora Store is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Aurora Store is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with Aurora Store. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.aurora.store.view.ui.splash
|
||||||
|
|
||||||
|
import android.accounts.AccountManager
|
||||||
|
import android.util.Log
|
||||||
|
import androidx.navigation.fragment.findNavController
|
||||||
|
import com.aurora.store.R
|
||||||
|
import com.aurora.store.data.model.AuthState
|
||||||
|
import com.aurora.store.util.CertUtil.GOOGLE_ACCOUNT_TYPE
|
||||||
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
|
|
||||||
|
@AndroidEntryPoint
|
||||||
|
class SplashFragment : BaseFlavouredSplashFragment() {
|
||||||
|
private val TAG = SplashFragment::class.java.simpleName
|
||||||
|
|
||||||
|
override fun attachActions() {
|
||||||
|
binding.btnAnonymous.addOnClickListener {
|
||||||
|
if (viewModel.authState.value != AuthState.Fetching) {
|
||||||
|
binding.btnAnonymous.updateProgress(true)
|
||||||
|
viewModel.buildAnonymousAuthData()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
binding.btnGoogle.addOnClickListener {
|
||||||
|
if (viewModel.authState.value != AuthState.Fetching) {
|
||||||
|
binding.btnGoogle.updateProgress(true)
|
||||||
|
if (canLoginWithMicroG) {
|
||||||
|
Log.i(TAG, "Found supported microG, trying to request credentials")
|
||||||
|
val accountIntent = AccountManager.newChooseAccountIntent(
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
arrayOf(GOOGLE_ACCOUNT_TYPE),
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null
|
||||||
|
)
|
||||||
|
startForAccount.launch(accountIntent)
|
||||||
|
} else {
|
||||||
|
findNavController().navigate(R.id.googleFragment)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun resetActions() {
|
||||||
|
binding.btnGoogle.apply {
|
||||||
|
updateProgress(false)
|
||||||
|
isEnabled = true
|
||||||
|
}
|
||||||
|
|
||||||
|
binding.btnAnonymous.apply {
|
||||||
|
updateProgress(false)
|
||||||
|
isEnabled = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user