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

Fix ktlint

Browse source
This commit is contained in:
Lucas Lima 2020-03-08 14:26:24 -03:00
parent cbd58e9ddc
commit 574f88b96d
22 changed files with 54 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.editorconfig Normal file
View file

@ -0,0 +1,5 @@
[*.{kt,kts}]
indent_size=4
insert_final_newline=true
max_line_length=120
disabled_rules=import-ordering,no-wildcard-imports

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

@ -25,14 +25,12 @@ import androidx.preference.PreferenceManager
import com.google.android.play.core.appupdate.AppUpdateManagerFactory
import com.google.android.play.core.install.model.AppUpdateType
import com.google.android.play.core.install.model.UpdateAvailability
import dev.lucasnlm.antimine.about.AboutActivity
import dev.lucasnlm.antimine.preferences.PreferencesActivity
import dagger.android.support.DaggerAppCompatActivity
import dev.lucasnlm.antimine.about.AboutActivity
import dev.lucasnlm.antimine.common.level.data.DifficultyPreset
import dev.lucasnlm.antimine.common.level.data.GameEvent
import dev.lucasnlm.antimine.common.level.data.GameStatus
import dev.lucasnlm.antimine.common.level.data.Mark
import dev.lucasnlm.antimine.common.level.viewmodel.GameViewModel
import dev.lucasnlm.antimine.common.level.viewmodel.GameViewModelFactory
import dev.lucasnlm.antimine.core.analytics.AnalyticsManager
@ -42,6 +40,7 @@ import dev.lucasnlm.antimine.core.utils.isDarkModeEnabled
import dev.lucasnlm.antimine.level.view.CustomLevelDialogFragment
import dev.lucasnlm.antimine.level.view.EndGameDialogFragment
import dev.lucasnlm.antimine.level.view.LevelFragment
import dev.lucasnlm.antimine.preferences.PreferencesActivity
import dev.lucasnlm.antimine.share.viewmodel.ShareViewModel
import kotlinx.android.synthetic.main.activity_game.*
import kotlinx.coroutines.GlobalScope
@ -441,9 +440,7 @@ class GameActivity : DaggerAppCompatActivity() {
waitAndShowEndGameDialog(false)
}
else -> {
}
else -> { }
}
}
@ -455,8 +452,8 @@ class GameActivity : DaggerAppCompatActivity() {
val appUpdateInfoTask = appUpdateManager.appUpdateInfo
appUpdateInfoTask.addOnSuccessListener { info ->
if (info.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE
&& info.isUpdateTypeAllowed(AppUpdateType.FLEXIBLE)
if (info.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE &&
info.isUpdateTypeAllowed(AppUpdateType.FLEXIBLE)
) {
try {
appUpdateManager.startUpdateFlowForResult(
@ -467,7 +464,6 @@ class GameActivity : DaggerAppCompatActivity() {
}
}
}
}
/**

14
app/src/main/java/dev/lucasnlm/antimine/TvGameActivity.kt
View file

@ -81,7 +81,7 @@ class TvGameActivity : DaggerAppCompatActivity() {
}
})
difficulty.observe(this@TvGameActivity, Observer {
//onChangeDifficulty(it)
// onChangeDifficulty(it)
})
}
@ -287,9 +287,7 @@ class TvGameActivity : DaggerAppCompatActivity() {
waitAndShowConfirmNewGame()
}
else -> {
}
else -> { }
}
}
@ -298,8 +296,8 @@ class TvGameActivity : DaggerAppCompatActivity() {
val appUpdateInfoTask = appUpdateManager.appUpdateInfo
appUpdateInfoTask.addOnSuccessListener { info ->
if (info.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE
&& info.isUpdateTypeAllowed(AppUpdateType.FLEXIBLE)) {
if (info.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE &&
info.isUpdateTypeAllowed(AppUpdateType.FLEXIBLE)) {
try {
appUpdateManager.startUpdateFlowForResult(
info, AppUpdateType.FLEXIBLE, this, 1)
@ -308,11 +306,9 @@ class TvGameActivity : DaggerAppCompatActivity() {
}
}
}
}
companion object {
const val TAG = "GameActivity"
const val PREFERENCE_FIRST_USE = "preference_first_use"
}
}
}

2
app/src/main/java/dev/lucasnlm/antimine/about/AboutActivity.kt
View file

@ -23,7 +23,7 @@ class AboutActivity : AppCompatActivity() {
)
thirdsParties.setOnClickListener { openThirdParties() }
sourceCode.setOnClickListener{ openSourceCode() }
sourceCode.setOnClickListener { openSourceCode() }
}
override fun onOptionsItemSelected(item: MenuItem): Boolean =

5
app/src/main/java/dev/lucasnlm/antimine/about/thirds/view/ThirdPartyAdapter.kt
View file

@ -17,8 +17,9 @@ internal class ThirdPartyAdapter(
override fun getItemCount(): Int = thirdParties.size
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ThirdPartyItemHolder {
val view = LayoutInflater.from(parent.context)
.inflate(R.layout.view_third_party, parent, false)
val view = LayoutInflater
.from(parent.context)
.inflate(R.layout.view_third_party, parent, false)
return ThirdPartyItemHolder(view)
}

3
common/src/androidTest/java/dev/lucasnlm/antimine/view/common/level/view/AreaScreenshot.kt
View file

@ -18,7 +18,6 @@ import org.junit.Test
import java.io.File
import java.io.FileOutputStream
class AreaScreenshot {
private lateinit var context: Context
@ -99,7 +98,6 @@ class AreaScreenshot {
screenshotTest(area, "covered_ambient.png", true)
}
@Test
fun testUncoveredArea() {
val area = Area(0, 0, 0, isCovered = false)
@ -159,7 +157,6 @@ class AreaScreenshot {
screenshotTest(area, "covered_question_ambient.png", true)
}
@Test
fun testCoveredAreaHighlighted() {
val area = Area(0, 0, 0, isCovered = true, highlighted = true)

2
common/src/main/java/dev/lucasnlm/antimine/common/level/LevelFacade.kt
View file

@ -172,7 +172,7 @@ class LevelFacade {
.filter {
it.mark == Mark.None
}
.map{
.map {
openField(it)
it.id
}

7
common/src/main/java/dev/lucasnlm/antimine/common/level/data/GameStatus.kt
View file

@ -5,8 +5,9 @@ sealed class GameStatus {
object Running : GameStatus()
class Over(val rightMines: Int = 0,
val totalMines: Int = 0,
val time: Long = 0
class Over(
val rightMines: Int = 0,
val totalMines: Int = 0,
val time: Long = 0
) : GameStatus()
}

3
common/src/main/java/dev/lucasnlm/antimine/common/level/database/data/Save.kt
View file

@ -31,6 +31,3 @@ data class Save(
@ColumnInfo(name = "field")
val field: List<Area>
)

2
common/src/main/java/dev/lucasnlm/antimine/common/level/repository/DimensionRepository.kt
View file

@ -35,4 +35,4 @@ class DimensionRepository(
styledAttributes.recycle()
return actionBarSize
}
}
}

6
common/src/main/java/dev/lucasnlm/antimine/common/level/view/AreaAdapter.kt
View file

@ -46,7 +46,11 @@ class AreaAdapter(
override fun getItemCount() = field.size
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FieldViewHolder {
val layout = if (viewModel.useAccessibilityMode()) { R.layout.view_accessibility_field } else { R.layout.view_field }
val layout = if (viewModel.useAccessibilityMode()) {
R.layout.view_accessibility_field
} else {
R.layout.view_field
}
val view = LayoutInflater.from(parent.context).inflate(layout, parent, false)
val holder = FieldViewHolder(view)

1
common/src/main/java/dev/lucasnlm/antimine/common/level/view/AreaPaintSettings.kt
View file

@ -8,4 +8,3 @@ data class AreaPaintSettings(
val rectF: RectF,
val radius: Float
)

23
common/src/main/java/dev/lucasnlm/antimine/common/level/view/AreaPainter.kt
View file

@ -10,16 +10,17 @@ import dev.lucasnlm.antimine.common.level.data.Mark
import dev.lucasnlm.antimine.common.level.model.AreaPalette
import dev.lucasnlm.antimine.common.level.repository.DrawableRepository
fun Area.paintOnCanvas(context: Context,
canvas: Canvas,
isAmbientMode: Boolean,
isLowBitAmbient: Boolean,
isFocused: Boolean,
drawableRepository: DrawableRepository,
paintSettings: AreaPaintSettings,
areaPalette: AreaPalette,
markPadding: Int? = null,
minePadding: Int? = null
fun Area.paintOnCanvas(
context: Context,
canvas: Canvas,
isAmbientMode: Boolean,
isLowBitAmbient: Boolean,
isFocused: Boolean,
drawableRepository: DrawableRepository,
paintSettings: AreaPaintSettings,
areaPalette: AreaPalette,
markPadding: Int? = null,
minePadding: Int? = null
) {
paintSettings.run {
if (isCovered) {
@ -35,7 +36,7 @@ fun Area.paintOnCanvas(context: Context,
style = Paint.Style.FILL
isAntiAlias = !isLowBitAmbient
color = areaPalette.covered
alpha = if(highlighted) 155 else 255
alpha = if (highlighted) 155 else 255
}
}

11
common/src/main/java/dev/lucasnlm/antimine/common/level/view/AreaView.kt
View file

@ -26,14 +26,11 @@ class AreaView : View {
private lateinit var palette: AreaPalette
private val drawableRepository = DrawableRepository()
constructor(context: Context)
: super(context)
constructor(context: Context) : super(context)
constructor(context: Context, attrs: AttributeSet?)
: super(context, attrs)
constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int)
: super(context, attrs, defStyleAttr)
constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
fun bindField(area: Area, isAmbientMode: Boolean, isLowBitAmbient: Boolean, paintSettings: AreaPaintSettings) {
this.paintSettings = paintSettings
@ -124,6 +121,4 @@ class AreaView : View {
)
return ContextCompat.getDrawable(context, outValue.resourceId)
}
}

6
common/src/main/java/dev/lucasnlm/antimine/common/level/view/UnlockedHorizontalScrollView.kt
View file

@ -12,11 +12,9 @@ class UnlockedHorizontalScrollView : HorizontalScrollView {
constructor(context: Context) : super(context)
constructor(context: Context, attrs: AttributeSet)
: super(context, attrs)
constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int)
: super(context, attrs, defStyleAttr)
constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
fun setTarget(recyclerView: RecyclerView) {
this.recyclerView = recyclerView

2
common/src/main/java/dev/lucasnlm/antimine/common/level/viewmodel/GameViewModel.kt
View file

@ -176,7 +176,7 @@ class GameViewModel(
field.postValue(levelFacade.field.toList())
}
if (preferencesRepository.useFlagAssistant() && !levelFacade.hasAnyMineExploded()){
if (preferencesRepository.useFlagAssistant() && !levelFacade.hasAnyMineExploded()) {
levelFacade.runFlagAssistant()
}

3
common/src/main/java/dev/lucasnlm/antimine/core/analytics/Event.kt
View file

@ -5,7 +5,8 @@ import dev.lucasnlm.antimine.common.level.data.GameStats
import dev.lucasnlm.antimine.common.level.data.LevelSetup
sealed class Event(
val title: String, val extra: Map<String, String> = mapOf()
val title: String,
val extra: Map<String, String> = mapOf()
) {
class Open : Event("Open game")

0
common/src/main/java/dev/lucasnlm/antimine/core/di/CommonComponent.kt → common/src/main/java/dev/lucasnlm/antimine/core/di/LevelComponent.kt
View file

1
common/src/main/java/dev/lucasnlm/antimine/core/preferences/PreferencesRepository.kt
View file

@ -45,5 +45,4 @@ class PreferencesRepository(
override fun useLargeAreas(): Boolean =
getBoolean("preference_large_area", false)
}

2
common/src/test/java/dev/lucasnlm/antimine/common/level/LevelFacadeTest.kt
View file

@ -417,4 +417,4 @@ class LevelFacadeTest {
assertFalse(checkVictory())
}
}
}
}

4
common/src/test/java/dev/lucasnlm/antimine/common/level/utils/ClockTest.kt
View file

@ -49,9 +49,9 @@ class ClockTest {
val mockTimer = mock<Timer>()
val clock = MockClock(mockTimer)
clock.start { }
clock.start { }
assertFalse(clock.isStopped)
clock.stop()
assertTrue(clock.isStopped)
}
}
}

2
wear/src/main/java/dev/lucasnlm/antimine/wear/WatchLevelFragment.kt
View file

@ -22,7 +22,7 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import javax.inject.Inject
class WatchLevelFragment: DaggerFragment() {
class WatchLevelFragment : DaggerFragment() {
@Inject
lateinit var viewModelFactory: GameViewModelFactory