Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[둘리] 3, 4단계 오목 제출합니다. #34

Merged
merged 55 commits into from
Mar 29, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
f4e19dd
rebase: step2
woowahan-pjs Mar 13, 2023
1fea9a1
feat: set up the android project
woowahan-pjs Mar 14, 2023
ea810cb
feat: domain 이동
hyemdooly Mar 22, 2023
b8e4a8c
feat: add main activity and resources
woowahan-pjs Mar 21, 2023
9d5a9ea
refactor(Omok, Controller): run 함수 삭제 및 컨트롤러로 이동
hyemdooly Mar 22, 2023
2aeb6a6
feat(activity_main): TextView 추가
hyemdooly Mar 22, 2023
bfe2f72
feat(GameEventListener): GameEventListener 구현
hyemdooly Mar 22, 2023
2fce9c1
refactor(Omok): 필요없는 주석 삭제
hyemdooly Mar 22, 2023
d9b8b7c
feat(Listener): 이벤트 리스너 구현 및 strings.xml에 string 정의
hyemdooly Mar 22, 2023
3bf95f6
feat(MainActivity): MainActivity 구현
hyemdooly Mar 22, 2023
3663712
refactor(Activity, Listener): 패키지 이동
hyemdooly Mar 22, 2023
00b6655
refactor(Omok): endGame 함수 수정
hyemdooly Mar 22, 2023
bbc9fdd
refactor(OmokTest): OmokTest 테스트 재구현
hyemdooly Mar 22, 2023
dba7e4f
refactor(InputView, OutputView): InputView OutputView 인터페이스 삭제
hyemdooly Mar 23, 2023
51d920c
refactor(TurnResult): TurnResult 생성, 점진적인 리팩터링
hyemdooly Mar 23, 2023
bcfeedb
refactor(MainActivity, PlayersTest): 필요없는 테스트 삭제, 도메인 변경에 따른 MainActi…
hyemdooly Mar 23, 2023
15a1a7b
refactor(Players, Omok, Controller): Players 위치 Omok 안으로 변경, 안드로이드 Tu…
hyemdooly Mar 23, 2023
ebbbff4
refactor(MainActivity, GameEventListener): 버그 수정
hyemdooly Mar 23, 2023
116de7b
refactor(OmokTest, PlayersTest): 리팩터링에 따른 테스트 수정
hyemdooly Mar 23, 2023
7308130
feat(MainActivity, Omok, OmokConstract, OmokDBHelper, Players): 데이터베이…
hyemdooly Mar 24, 2023
8776916
refactor(gitignore): gitignore 추가
hyemdooly Mar 24, 2023
a11e464
feat(DBManager): DB로부터 원하는 정보를 뽑아주는 DBManager 생성
hyemdooly Mar 24, 2023
ff54862
refactor(MainActivity): 메인 액티비티 리팩터링
hyemdooly Mar 24, 2023
9c68fba
refactor(OmokDBManager): 필요없는 코드 삭제
hyemdooly Mar 24, 2023
0bde83d
refactor(xml): 오목판 커스텀
hyemdooly Mar 24, 2023
66200e5
refactor(MainActivity): 오목판 세팅 함수 분리
hyemdooly Mar 24, 2023
8bedfaa
refactor(MainActivity): 필요없는 코드 삭제
hyemdooly Mar 24, 2023
c753b65
fix(WhitePlayerTest): 테스트 코드 수정
hyemdooly Mar 24, 2023
5b456b2
Merge branch 'hyemdooly' into step4
hyemdooly Mar 24, 2023
4508479
refactor(xml): 필요없는 파일 삭제
hyemdooly Mar 26, 2023
b0a5e0f
refactor(Players, Player): 놓은 돌의 개수를 반환하는 함수 작성
hyemdooly Mar 26, 2023
31d1f8a
refactor(PlayerState): points 변수 protected 삭제
hyemdooly Mar 26, 2023
774c598
refactor(PlayerState): points 변수 protected 복구, getAllPoints 깊은 복사
hyemdooly Mar 26, 2023
a52748f
refactor(Black,WhitePlayerTest): 필요없는 정보 숨기기
hyemdooly Mar 26, 2023
e760a35
refactor(Points): Point List 깊은 복사
hyemdooly Mar 26, 2023
1c6b39f
refactor(PlayersTest): 테스트 코드 수정
hyemdooly Mar 26, 2023
3c0c212
refactor(MainActivity): 코드 다이어트 및 by lazy 적용
hyemdooly Mar 26, 2023
e8a7478
refactor(all): ktlintFormatting
hyemdooly Mar 26, 2023
bc554db
refactor(Players): latestPlayer 불변으로 변경
hyemdooly Mar 26, 2023
9d15441
refactor(Players, WhitePlayer, BlackPlayer): stone -> point로 명칭 변경, 최…
hyemdooly Mar 26, 2023
2d9db1e
refactor(OmokGameEventListener): InputView의 인터페이스 삭제, GameEventListen…
hyemdooly Mar 26, 2023
19e46b5
fix(BlackPlayer, WhitePlayer): 오류 수정
hyemdooly Mar 26, 2023
2aab2ac
refactor(TurnResult): 턴의 결과를 모두 포함하도록 수정
hyemdooly Mar 26, 2023
160abef
refactor(Omok): 필요없는 함수 삭제
hyemdooly Mar 26, 2023
355405a
refactor(MainActivity, TurnEventListener): 도메인 변경에 따른 코드 변경
hyemdooly Mar 26, 2023
e602dd4
refactor(Players, MainActivity): 필요없는 코드 삭제, 변수 네이밍 변경
hyemdooly Mar 26, 2023
3178d22
refactor(MainActivity, Controller, DBHelper, OutputView): 리스너, DB매니저 …
hyemdooly Mar 27, 2023
ccb0c20
refactor(ktlintFormat): ktlintformatting
hyemdooly Mar 27, 2023
b0e1fa1
refactor(DBHelper): db를 변수로 가지도록 변경
hyemdooly Mar 27, 2023
fd3b14b
refactor(Players): Players 팩토리 함수 생성
hyemdooly Mar 28, 2023
6d1ac8b
refactor(MainActivity): applicationContext -> this 변경
hyemdooly Mar 28, 2023
343d2fe
refactor(MainActivity): 많은 if문 when문 사용하여 정리
hyemdooly Mar 28, 2023
14ad02c
refactor(PlayersTest): 팩토리 함수 구현으로 인한 변경
hyemdooly Mar 28, 2023
d347785
refactor(OmokDBHelper): 오목 도메인을 가질 수 있도록 수정
hyemdooly Mar 28, 2023
98d9be3
refactor(MainActivity): onCreate에서 onClickListener 내용 분리
hyemdooly Mar 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat(DBManager): DB로부터 원하는 정보를 뽑아주는 DBManager 생성
  • Loading branch information
hyemdooly committed Mar 24, 2023
commit a11e464a149f69c429bc1733bd946087e3d54f78
84 changes: 22 additions & 62 deletions app/src/main/java/woowacourse/omok/activity/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package woowacourse.omok.activity

import android.content.ContentValues
import android.os.Bundle
import android.util.Log
import android.widget.ImageView
import android.widget.TableLayout
import android.widget.TableRow
Expand All @@ -17,64 +15,45 @@ import domain.point.Point
import domain.point.Points
import domain.result.TurnResult
import domain.rule.BlackRenjuRule
import domain.rule.WhiteRenjuRule
import domain.state.PlayingState
import domain.stone.StoneColor
import woowacourse.omok.listener.GameEventListener
import woowacourse.omok.R
import woowacourse.omok.db.OmokConstract
import woowacourse.omok.db.OmokDBHelper
import woowacourse.omok.db.OmokDBManager

class MainActivity : AppCompatActivity() {
lateinit var omok: Omok
private lateinit var omok: Omok
private lateinit var dbManager: OmokDBManager

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lateinit 대신 코틀린의 by lazy { } 를 적용 해보세요

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)

val blackPoints = mutableListOf<Point>()
val whitePoints = mutableListOf<Point>()
dbManager = OmokDBManager(applicationContext)

val db = OmokDBHelper(this).writableDatabase
val cursor = db.query(
OmokConstract.TABLE_NAME,
arrayOf(
OmokConstract.TABLE_COLUMN_POSITION,
OmokConstract.TABLE_COLUMN_IS_BLACK,
),
null,
null,
null,
null,
OmokConstract.TABLE_COLUMN_POSITION
)
val board = findViewById<TableLayout>(R.id.board)
val boardSetting = board
val boardViews = board
.children
.filterIsInstance<TableRow>()
.flatMap { it.children }
.filterIsInstance<ImageView>().toList()

while (cursor.moveToNext()) {
val position =
cursor.getInt(cursor.getColumnIndexOrThrow(OmokConstract.TABLE_COLUMN_POSITION))
val isBlack =
cursor.getInt(cursor.getColumnIndexOrThrow(OmokConstract.TABLE_COLUMN_IS_BLACK))
if (isBlack == 1) {
Log.d("isBLACK : ", OmokConstract.TABLE_COLUMN_POSITION)
boardSetting[position].setImageResource(R.drawable.pink_bear)
blackPoints.add(calculateIndexToPoint(position))
continue
}
boardSetting[position].setImageResource(R.drawable.white_bear)
whitePoints.add(calculateIndexToPoint(position))
val blackIndexs = dbManager.getIndexsByColor("BLACK")
val whiteIndexs = dbManager.getIndexsByColor("WHITE")

blackIndexs.forEach {
boardViews[it].setImageResource(R.drawable.pink_bear)
}
whiteIndexs.forEach {
boardViews[it].setImageResource(R.drawable.white_bear)
}

val blackPlayer = BlackPlayer(PlayingState(Points(blackPoints)), rule = BlackRenjuRule())
val whitePlayer = WhitePlayer(PlayingState(Points(whitePoints)), rule = BlackRenjuRule())
val blackPlayer = BlackPlayer(PlayingState(Points(blackIndexs.map { calculateIndexToPoint(it) })), rule = BlackRenjuRule())
val whitePlayer = WhitePlayer(PlayingState(Points(whiteIndexs.map { calculateIndexToPoint(it) })), rule = WhiteRenjuRule())
omok = Omok(blackPlayer, whitePlayer)

val gameEventListener =
GameEventListener(applicationContext, findViewById(R.id.description))

gameEventListener.onStartGame()
gameEventListener.onStartTurn(omok.players.curPlayerColor, omok.players.getLastPoint())

Expand All @@ -89,14 +68,7 @@ class MainActivity : AppCompatActivity() {
val result = omok.takeTurn(calculateIndexToPoint(index))
if (result is TurnResult.Success) {
setStone(view, omok.players)
db.insert(
OmokConstract.TABLE_NAME,
null,
values(
index,
booleanToInt(omok.players.curPlayerColor.next() == StoneColor.BLACK)
)
)
dbManager.insert(index, omok.players.curPlayerColor.next().name)
}
gameEventListener.onEndTurn(result)
gameEventListener.onEndGame(omok.players)
Expand All @@ -106,33 +78,21 @@ class MainActivity : AppCompatActivity() {

override fun onStop() {
super.onStop()
val db = OmokDBHelper(this).writableDatabase
if (!omok.isPlaying) db.execSQL("DELETE FROM ${OmokConstract.TABLE_NAME}")
if (!omok.isPlaying) dbManager.deleteAll()
}

override fun onDestroy() {
super.onDestroy()
dbManager.close()
}
private fun setStone(view: ImageView, players: Players) {
when (players.curPlayerColor.next()) {
StoneColor.BLACK -> view.setImageResource(R.drawable.pink_bear)
StoneColor.WHITE -> view.setImageResource(R.drawable.white_bear)
}
}

private fun values(position: Int, isBlack: Int): ContentValues {
val values = ContentValues()
values.put(OmokConstract.TABLE_COLUMN_POSITION, position)
values.put(OmokConstract.TABLE_COLUMN_IS_BLACK, isBlack)
return values
}

private fun calculateIndexToPoint(index: Int): Point =
Point(index / OMOK_BOARD_SIZE + 1, index % OMOK_BOARD_SIZE + 1)

private fun calculatePointToIndex(point: Point?): Int =
point?.let { (point.row - 1) * OMOK_BOARD_SIZE + point.col - 1 } ?: -1

private fun booleanToInt(value: Boolean): Int {
if (value) return 1
return 0
}
}

2 changes: 1 addition & 1 deletion app/src/main/java/woowacourse/omok/db/OmokConstract.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ import android.provider.BaseColumns
object OmokConstract: BaseColumns {
const val TABLE_NAME = "game_info"
const val TABLE_COLUMN_POSITION = "position"
const val TABLE_COLUMN_IS_BLACK = "color"
const val TABLE_COLUMN_COLOR = "color"
}
2 changes: 1 addition & 1 deletion app/src/main/java/woowacourse/omok/db/OmokDBHelper.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class OmokDBHelper(context: Context?) : SQLiteOpenHelper(context, DATABASE_NAME,
db?.execSQL(
"CREATE TABLE ${OmokConstract.TABLE_NAME} (" +
" ${OmokConstract.TABLE_COLUMN_POSITION} int not null," +
" ${OmokConstract.TABLE_COLUMN_IS_BLACK} int" +
" ${OmokConstract.TABLE_COLUMN_COLOR} varchar(50) not null" +
");"
)
}
Expand Down
51 changes: 51 additions & 0 deletions app/src/main/java/woowacourse/omok/db/OmokDBManager.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package woowacourse.omok.db

import android.content.ContentValues
import android.content.Context
import domain.game.Omok
import domain.point.Point

class OmokDBManager(context: Context) {
private val db = OmokDBHelper(context).writableDatabase

fun getIndexsByColor(color: String): List<Int> {
val indexs = mutableListOf<Int>()
if (!db.isOpen) throw IllegalAccessException()
val cursor = db.query(
OmokConstract.TABLE_NAME,
arrayOf(OmokConstract.TABLE_COLUMN_POSITION),
"${OmokConstract.TABLE_COLUMN_COLOR} = ?",
arrayOf(color),
null,
null,
null
)

while (cursor.moveToNext()) indexs.add(cursor.getInt(0))
return indexs.toList()
}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OmokHelper를 만든 목적이 무엇일까요?

실제 데이터베이스에 접근하는 책임을 부여하기 위해 만든 것이라면, 매니저에서 관련 코드를 작성하는것이 맞을까요?

매니저가 도메인 로직과 데이터베이스 간의 협력 관계를 위한 역할이라면,
보다 관련있는 형태로 작성되어야 하지는 않을까요?


private fun calculateIndexToPoint(index: Int): Point =
Point(index / Omok.OMOK_BOARD_SIZE + 1, index % Omok.OMOK_BOARD_SIZE + 1)


fun insert(index: Int, color: String) {
if (!db.isOpen) throw IllegalAccessException()
db.insert(OmokConstract.TABLE_NAME, null, values(index, color))
}

private fun values(position: Int, color: String): ContentValues {
val values = ContentValues()
values.put(OmokConstract.TABLE_COLUMN_POSITION, position)
values.put(OmokConstract.TABLE_COLUMN_COLOR, color)
return values
}

fun deleteAll() {
db.execSQL("DELETE FROM ${OmokConstract.TABLE_NAME}")
}

fun close() {
db.close()
}
}