wbrawner/antimine-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix tests

Browse source
This commit is contained in:
Lucas Lima 2020-08-20 00:29:47 -03:00
parent 8b0f8cae1f
commit 272b76156e
No known key found for this signature in database
GPG key ID: C5EEF4C30BFBF8D7
6 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt
View file

@ -96,7 +96,7 @@ class GameActivity : ThematicActivity(R.layout.activity_game), DialogInterface.O
loadGameFragment() loadGameFragment()
} }
if (instantAppManager.isEnabled()) { if (instantAppManager.isEnabled(applicationContext)) {
bindInstantApp() bindInstantApp()
savesRepository.setLimit(1) savesRepository.setLimit(1)
} else { } else {
@ -185,7 +185,7 @@ class GameActivity : ThematicActivity(R.layout.activity_game), DialogInterface.O
drawer.closeDrawer(GravityCompat.START) drawer.closeDrawer(GravityCompat.START)
gameViewModel.resumeGame() gameViewModel.resumeGame()
} }
status == Status.Running && instantAppManager.isEnabled() -> showQuitConfirmation { status == Status.Running && instantAppManager.isEnabled(applicationContext) -> showQuitConfirmation {
super.onBackPressed() super.onBackPressed()
} }
else -> super.onBackPressed() else -> super.onBackPressed()
@ -344,7 +344,7 @@ class GameActivity : ThematicActivity(R.layout.activity_game), DialogInterface.O
handled handled
} }
navigationView.menu.findItem(R.id.share_now).isVisible = !instantAppManager.isEnabled() navigationView.menu.findItem(R.id.share_now).isVisible = !instantAppManager.isEnabled(applicationContext)
if (!playGamesManager.hasGooglePlayGames()) { if (!playGamesManager.hasGooglePlayGames()) {
navigationView.menu.removeGroup(R.id.play_games_group) navigationView.menu.removeGroup(R.id.play_games_group)

2
app/src/main/java/dev/lucasnlm/antimine/level/view/EndGameDialogFragment.kt
View file

@ -68,7 +68,7 @@ class EndGameDialogFragment : AppCompatDialogFragment() {
} }
when { when {
instantAppManager.isEnabled() -> { instantAppManager.isEnabled(context) -> {
setNeutralButton(R.string.install) { _, _ -> setNeutralButton(R.string.install) { _, _ ->
activity?.run { activity?.run {
instantAppManager.showInstallPrompt(this, null, 0, null) instantAppManager.showInstallPrompt(this, null, 0, null)

6
app/src/test/java/dev/lucasnlm/antimine/di/TestAppModule.kt
View file

@ -15,11 +15,7 @@ import org.koin.dsl.module
val AppModule = module { val AppModule = module {
single { single {
object : IInstantAppManager { object : IInstantAppManager {
override fun isEnabled(): Boolean = false override fun isEnabled(context: Context): Boolean = false
override fun isInstantAppSupported(context: Context): Boolean = false
override fun isInAppPaymentsSupported(context: Context): Boolean = false
override fun showInstallPrompt( override fun showInstallPrompt(
activity: Activity, activity: Activity,

4
external/src/main/java/dev/lucasnlm/external/IInstantAppManager.kt vendored
View file

@ -5,8 +5,6 @@ import android.content.Context
import android.content.Intent import android.content.Intent
interface IInstantAppManager { interface IInstantAppManager {
fun isEnabled(): Boolean fun isEnabled(context: Context): Boolean
fun isInstantAppSupported(context: Context): Boolean
fun isInAppPaymentsSupported(context: Context): Boolean
fun showInstallPrompt(activity: Activity, intent: Intent?, requestCode: Int, referrer: String?): Boolean fun showInstallPrompt(activity: Activity, intent: Intent?, requestCode: Int, referrer: String?): Boolean
} }

10
foss/src/main/java/dev/lucasnlm/external/InstantAppManager.kt vendored
View file

@ -5,15 +5,7 @@ import android.content.Context
import android.content.Intent import android.content.Intent
class InstantAppManager : IInstantAppManager { class InstantAppManager : IInstantAppManager {
override fun isEnabled(): Boolean { override fun isEnabled(context: Context): Boolean {
return false
}
override fun isInstantAppSupported(context: Context): Boolean {
return false
}
override fun isInAppPaymentsSupported(context: Context): Boolean {
return false return false
} }

6
proprietary/src/main/java/dev/lucasnlm/external/InstantAppManager.kt vendored
View file

@ -6,14 +6,10 @@ import android.content.Intent
import com.google.android.gms.instantapps.InstantApps import com.google.android.gms.instantapps.InstantApps
class InstantAppManager : IInstantAppManager { class InstantAppManager : IInstantAppManager {
override fun isInstantAppSupported(context: Context): Boolean { override fun isEnabled(context: Context): Boolean {
return InstantApps.getPackageManagerCompat(context).isInstantApp return InstantApps.getPackageManagerCompat(context).isInstantApp
} }
override fun isInAppPaymentsSupported(context: Context): Boolean {
return true
}
override fun showInstallPrompt(activity: Activity, intent: Intent?, requestCode: Int, referrer: String?): Boolean = override fun showInstallPrompt(activity: Activity, intent: Intent?, requestCode: Int, referrer: String?): Boolean =
InstantApps.showInstallPrompt(activity, intent, requestCode, referrer) InstantApps.showInstallPrompt(activity, intent, requestCode, referrer)
} }