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

Update CloudeSaveManager code

Browse source
This commit is contained in:
Lucas Lima 2020-12-31 16:11:58 -03:00 committed by Lucas Nunes
parent 8cdf295fd4
commit a503838d1f
13 changed files with 54 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,6 @@ import androidx.lifecycle.Transformations
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.viewModelScope
import androidx.preference.PreferenceManager
import dev.lucasnlm.antimine.cloud.CloudSaveManager
import dev.lucasnlm.antimine.common.level.models.Difficulty
import dev.lucasnlm.antimine.common.level.models.Event
import dev.lucasnlm.antimine.common.level.models.Score

6
app/src/main/java/dev/lucasnlm/antimine/cloud/CloudSaveManager.kt → app/src/main/java/dev/lucasnlm/antimine/cloud/CloudSaveManagerImpl.kt
View file

@ -2,7 +2,7 @@ package dev.lucasnlm.antimine.cloud
import dev.lucasnlm.antimine.common.level.database.models.toHashMap
import dev.lucasnlm.antimine.common.level.repository.IStatsRepository
import dev.lucasnlm.antimine.core.cloud.ICloudSaveManager
import dev.lucasnlm.antimine.core.cloud.CloudSaveManager
import dev.lucasnlm.antimine.preferences.IPreferencesRepository
import dev.lucasnlm.external.ICloudStorageManager
import dev.lucasnlm.external.IPlayGamesManager
@ -12,12 +12,12 @@ import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
class CloudSaveManager(
class CloudSaveManagerImpl(
private val playGamesManager: IPlayGamesManager,
private val preferencesRepository: IPreferencesRepository,
private val statsRepository: IStatsRepository,
private val cloudStorageManager: ICloudStorageManager,
) : ICloudSaveManager {
) : CloudSaveManager {
override fun uploadSave() {
GlobalScope.launch {
withContext(Dispatchers.IO) {

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

@ -1,12 +1,12 @@
package dev.lucasnlm.antimine.di
import dev.lucasnlm.antimine.cloud.CloudSaveManager
import dev.lucasnlm.antimine.cloud.CloudSaveManagerImpl
import dev.lucasnlm.antimine.support.IapHandler
import dev.lucasnlm.antimine.common.BuildConfig
import dev.lucasnlm.antimine.core.analytics.DebugAnalyticsManager
import dev.lucasnlm.antimine.core.analytics.IAnalyticsManager
import dev.lucasnlm.antimine.core.analytics.ProdAnalyticsManager
import dev.lucasnlm.antimine.core.cloud.ICloudSaveManager
import dev.lucasnlm.antimine.core.cloud.CloudSaveManager
import dev.lucasnlm.antimine.share.ShareManager
import dev.lucasnlm.external.AdsManager
import dev.lucasnlm.external.BillingManager
@ -43,7 +43,7 @@ val AppModule = module {
single { IapHandler(get(), get(), get()) }
single { CloudSaveManager(get(), get(), get(), get()) } bind ICloudSaveManager::class
single { CloudSaveManagerImpl(get(), get(), get(), get()) } bind CloudSaveManager::class
single { FeatureFlagManager() } bind IFeatureFlagManager::class

1
app/src/main/java/dev/lucasnlm/antimine/preferences/PreferencesActivity.kt
View file

@ -8,7 +8,6 @@ import androidx.preference.PreferenceFragmentCompat
import androidx.preference.PreferenceManager
import dev.lucasnlm.antimine.R
import dev.lucasnlm.antimine.ui.ThematicActivity
import dev.lucasnlm.antimine.cloud.CloudSaveManager
import org.koin.android.ext.android.inject
class PreferencesActivity :

1
app/src/main/java/dev/lucasnlm/antimine/theme/ThemeActivity.kt
View file

@ -6,7 +6,6 @@ import android.view.MenuItem
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.GridLayoutManager
import dev.lucasnlm.antimine.R
import dev.lucasnlm.antimine.cloud.CloudSaveManager
import dev.lucasnlm.antimine.common.level.repository.IDimensionRepository
import dev.lucasnlm.antimine.common.level.view.SpaceItemDecoration
import dev.lucasnlm.antimine.preferences.IPreferencesRepository

6
control/build.gradle
View file

@ -66,4 +66,10 @@ dependencies {
// Kotlin Lib
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.10'
// Unit Tests
testImplementation 'junit:junit:4.13.1'
testImplementation 'org.mockito:mockito-core:2.24.0'
testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
testImplementation "io.mockk:mockk:1.10.3"
}

4
control/src/main/java/dev/lucasnlm/antimine/control/ControlDialogFragment.kt
View file

@ -12,13 +12,13 @@ import dev.lucasnlm.antimine.control.view.ControlItemView
import dev.lucasnlm.antimine.control.view.SimpleControlItemView
import dev.lucasnlm.antimine.control.viewmodel.ControlEvent
import dev.lucasnlm.antimine.control.viewmodel.ControlViewModel
import dev.lucasnlm.antimine.core.cloud.ICloudSaveManager
import dev.lucasnlm.antimine.core.cloud.CloudSaveManager
import dev.lucasnlm.antimine.preferences.models.ControlStyle
import org.koin.android.ext.android.inject
import org.koin.androidx.viewmodel.ext.android.viewModel
class ControlDialogFragment : AppCompatDialogFragment() {
private val cloudSaveManager by inject<ICloudSaveManager>()
private val cloudSaveManager by inject<CloudSaveManager>()
private val controlViewModel by viewModel<ControlViewModel>()
private val adapter by lazy { ControlListAdapter(controlViewModel) }

30
app/src/test/java/dev/lucasnlm/antimine/control/ControlViewModelTest.kt → control/src/test/java/dev/lucasnlm/antimine/control/viewmodel/ControlViewModelTest.kt
View file

@ -1,16 +1,34 @@
package dev.lucasnlm.antimine.control
package dev.lucasnlm.antimine.control.viewmodel
import dev.lucasnlm.antimine.IntentViewModelTest
import dev.lucasnlm.antimine.control.viewmodel.ControlEvent
import dev.lucasnlm.antimine.control.viewmodel.ControlViewModel
import dev.lucasnlm.antimine.preferences.models.ControlStyle
import dev.lucasnlm.antimine.preferences.IPreferencesRepository
import dev.lucasnlm.antimine.preferences.models.ControlStyle
import io.mockk.every
import io.mockk.mockk
import io.mockk.verify
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.TestCoroutineDispatcher
import kotlinx.coroutines.test.resetMain
import kotlinx.coroutines.test.setMain
import org.junit.After
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test
class ControlViewModelTest : IntentViewModelTest() {
@ExperimentalCoroutinesApi
class ControlViewModelTest {
private val dispatcher = TestCoroutineDispatcher()
@Before
fun setup() {
Dispatchers.setMain(dispatcher)
}
@After
fun tearDown() {
Dispatchers.resetMain()
}
private fun ControlViewModel.selectedControlStyle() = singleState().let {
it.gameControls[it.selectedIndex].controlStyle
}

2
core/src/main/java/dev/lucasnlm/antimine/core/cloud/CloudSaveManager.kt
View file

@ -1,5 +1,5 @@
package dev.lucasnlm.antimine.core.cloud
interface ICloudSaveManager {
interface CloudSaveManager {
fun uploadSave()
}

6
preferences/build.gradle
View file

@ -37,4 +37,10 @@ dependencies {
// AndroidX
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.preference:preference-ktx:1.1.1'
// Unit Tests
testImplementation 'junit:junit:4.13.1'
testImplementation 'org.mockito:mockito-core:2.24.0'
testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
testImplementation "io.mockk:mockk:1.10.3"
}

5
common/src/test/java/dev/lucasnlm/antimine/core/preferences/PreferencesRepositoryTest.kt → preferences/src/test/java/dev/lucasnlm/antimine/preferences/PreferencesRepositoryTest.kt
View file

@ -1,12 +1,11 @@
package dev.lucasnlm.antimine.core.preferences
package dev.lucasnlm.antimine.preferences
import dev.lucasnlm.antimine.preferences.PreferencesRepository
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Test
private class TestPreferenceManager : dev.lucasnlm.antimine.preferences.IPreferencesManager {
private class TestPreferenceManager : IPreferencesManager {
val values = mutableMapOf<String, Any>()
override fun getBoolean(key: String, defaultValue: Boolean): Boolean {

6
ui/build.gradle
View file

@ -60,4 +60,10 @@ dependencies {
// Kotlin Lib
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.10'
// Unit Tests
testImplementation 'junit:junit:4.13.1'
testImplementation 'org.mockito:mockito-core:2.24.0'
testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
testImplementation "io.mockk:mockk:1.10.3"
}

3
common/src/test/java/dev/lucasnlm/antimine/core/themes/repository/ThemeRepositoryTest.kt → ui/src/test/java/dev/lucasnlm/antimine/ui/repository/ThemeRepositoryTest.kt
View file

@ -1,6 +1,5 @@
package dev.lucasnlm.antimine.core.themes.repository
package dev.lucasnlm.antimine.ui.repository
import dev.lucasnlm.antimine.ui.repository.Themes
import org.junit.Assert.assertEquals
import org.junit.Test