Skip to content

Commit

Permalink
add and run ktlint formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
IamRezaMousavi committed Mar 24, 2024
1 parent 0ea1884 commit 592e557
Show file tree
Hide file tree
Showing 25 changed files with 292 additions and 255 deletions.
7 changes: 7 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[*.{kt,kts}]
indent_size = 4
max_line_length = 100
ktlint_code_style = android_studio
ktlint_experimental=enabled
ktlint_class_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than=1
ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than=2
3 changes: 3 additions & 0 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ jobs:

- name: Lint with Gradle
run: ./gradlew lint

- name: Run ktlint
run: ./gradlew ktlintCheck

- name: Test with Gradle
run: ./gradlew test
Expand Down
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("org.jlleitschuh.gradle.ktlint") version "12.1.0"
}

android {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package com.github.iamrezamousavi.mafia

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.platform.app.InstrumentationRegistry
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.runner.RunWith

import org.junit.Assert.*

/**
* Instrumented test, which will execute on an Android device.
*
Expand All @@ -21,4 +19,4 @@ class ExampleInstrumentedTest {
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("com.github.iamrezamousavi.mafia", appContext.packageName)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ package com.github.iamrezamousavi.mafia.data.model
data class Player(
var id: Int = 0,
val name: String = "",
var isChecked: Boolean = false,
var isChecked: Boolean = false
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ data class Role(
var id: Int = 0,

@StringRes
val name: Int,
val name: Int
)
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ package com.github.iamrezamousavi.mafia.data.repository
import com.github.iamrezamousavi.mafia.data.model.Player
import com.github.iamrezamousavi.mafia.data.source.SharedPreferencesManager

class PlayerRepository(private val sharedPreferencesManager: SharedPreferencesManager) {
class PlayerRepository(
private val sharedPreferencesManager: SharedPreferencesManager
) {

fun getPlayers(): ArrayList<Player> = sharedPreferencesManager.getPlayers()

fun savePlayers(players: ArrayList<Player>) {
sharedPreferencesManager.savePlayers(players)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ class SharedPreferencesManager(
ArrayList()
}
}
}
}
131 changes: 131 additions & 0 deletions app/src/main/kotlin/com/github/iamrezamousavi/mafia/utils/GetString.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
package com.github.iamrezamousavi.mafia.utils

import android.content.Context
import androidx.annotation.StringRes
import com.github.iamrezamousavi.mafia.R

@StringRes
fun getSide(@StringRes role: Int): Int = when (role) {
R.string.simple_citizen,
R.string.doctor,
R.string.detective,
R.string.sniper,
R.string.mayor,
R.string.guardian,
R.string.psychologist,
R.string.professional,
R.string.gunman,
R.string.judge,
R.string.champion,
R.string.priest,
R.string.hacker,
R.string.angel,
R.string.vigilante,
R.string.bartender -> R.string.citizen_side

R.string.simple_mafia,
R.string.godfather,
R.string.dr_lecter,
R.string.silencer,
R.string.terrorist,
R.string.negotiator,
R.string.nato,
R.string.vandal,
R.string.magician,
R.string.hostage_taker,
R.string.bodyguard,
R.string.bomber -> R.string.mafia_side

R.string.unknown,
R.string.wolfs_rain,
R.string.killer,
R.string.thousand_faces,
R.string.syndicate -> R.string.independent_side

else -> R.string.citizen_side
}

@StringRes
fun getDescription(@StringRes role: Int): Int = when (role) {
R.string.simple_citizen -> R.string.simple_citizen_desc
R.string.doctor -> R.string.doctor_desc
R.string.detective -> R.string.detective_desc
R.string.sniper -> R.string.sniper_desc
R.string.mayor -> R.string.mayor_desc
R.string.guardian -> R.string.guardian_desc
R.string.psychologist -> R.string.psychologist_desc
R.string.professional -> R.string.professional_desc
R.string.gunman -> R.string.gunman_desc
R.string.judge -> R.string.judge_desc
R.string.champion -> R.string.champion_desc
R.string.priest -> R.string.priest_desc
R.string.hacker -> R.string.hacker_desc
R.string.angel -> R.string.angel_desc
R.string.vigilante -> R.string.vigilante_desc
R.string.bartender -> R.string.bartender_desc

R.string.simple_mafia -> R.string.simple_mafia_desc
R.string.godfather -> R.string.godfather_desc
R.string.dr_lecter -> R.string.dr_lecter_desc
R.string.silencer -> R.string.silencer_desc
R.string.terrorist -> R.string.terrorist_desc
R.string.negotiator -> R.string.negotiator_desc
R.string.nato -> R.string.nato_desc
R.string.vandal -> R.string.vandal_desc
R.string.magician -> R.string.magician_desc
R.string.hostage_taker -> R.string.hostage_taker_desc
R.string.bodyguard -> R.string.bodyguard_desc
R.string.bomber -> R.string.bomber_desc

R.string.unknown -> R.string.unknown_desc
R.string.wolfs_rain -> R.string.wolfs_rain_desc
R.string.killer -> R.string.killer_desc
R.string.thousand_faces -> R.string.thousand_faces_desc
R.string.syndicate -> R.string.syndicate_desc

else -> R.string.simple_citizen_desc
}

@StringRes
fun getRoleId(
context: Context,
roleName: String
): Int = when (roleName) {
context.getString(R.string.simple_citizen) -> R.string.simple_citizen
context.getString(R.string.doctor) -> R.string.doctor
context.getString(R.string.detective) -> R.string.detective
context.getString(R.string.sniper) -> R.string.sniper
context.getString(R.string.mayor) -> R.string.mayor
context.getString(R.string.guardian) -> R.string.guardian
context.getString(R.string.psychologist) -> R.string.psychologist
context.getString(R.string.professional) -> R.string.professional
context.getString(R.string.gunman) -> R.string.gunman
context.getString(R.string.judge) -> R.string.judge
context.getString(R.string.champion) -> R.string.champion
context.getString(R.string.priest) -> R.string.priest
context.getString(R.string.hacker) -> R.string.hacker
context.getString(R.string.angel) -> R.string.angel
context.getString(R.string.vigilante) -> R.string.vigilante
context.getString(R.string.bartender) -> R.string.bartender

context.getString(R.string.simple_mafia) -> R.string.simple_mafia
context.getString(R.string.godfather) -> R.string.godfather
context.getString(R.string.dr_lecter) -> R.string.dr_lecter
context.getString(R.string.silencer) -> R.string.silencer
context.getString(R.string.terrorist) -> R.string.terrorist
context.getString(R.string.negotiator) -> R.string.negotiator
context.getString(R.string.nato) -> R.string.nato
context.getString(R.string.vandal) -> R.string.vandal
context.getString(R.string.magician) -> R.string.magician
context.getString(R.string.hostage_taker) -> R.string.hostage_taker
context.getString(R.string.bodyguard) -> R.string.bodyguard
context.getString(R.string.bomber) -> R.string.bomber

context.getString(R.string.unknown) -> R.string.unknown
context.getString(R.string.wolfs_rain) -> R.string.wolfs_rain
context.getString(R.string.killer) -> R.string.killer
context.getString(R.string.thousand_faces) -> R.string.thousand_faces
context.getString(R.string.syndicate) -> R.string.syndicate

else -> R.string.simple_citizen
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,4 @@ object SharedData {
val index = _players.value!!.indexOf(player)
return _roles.value!![index]
}

}
135 changes: 0 additions & 135 deletions app/src/main/kotlin/com/github/iamrezamousavi/mafia/utils/getString.kt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class MainActivity : AppCompatActivity() {
},
onDeleteClicked = { player ->
viewModel.removePlayer(player.id)
},
}
)
binding.peopleList.adapter = playerAdapter
binding.peopleList.layoutManager = LinearLayoutManager(this)
Expand Down
Loading

0 comments on commit 592e557

Please sign in to comment.