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

[Team-01][Android] 드래그 앤 드롭 및 리얼 서버 연동 #203

Open
wants to merge 34 commits into
base: team-01
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
c27ef32
[Android] 히스토리 기능 구현 - View (#31)
banjjak2 Apr 7, 2022
2b8e44a
feat: ViewModel 구현 및 Repository 생성
shncder Apr 8, 2022
c10fe08
개인저장
shncder Apr 11, 2022
c7119d3
[Android] PR 피드백 수정 (#41)
banjjak2 Apr 12, 2022
fd11ce4
chore: mockup API 수정 사항 적용
banjjak2 Apr 12, 2022
b596a2d
Merge pull request #43 from ku-kim/feature/Android/mockup-update
shncder Apr 12, 2022
eb126f0
[Android] Network 관련 코드 분리 및 레포지토리 이름 변경 (#45)
banjjak2 Apr 12, 2022
dd55cf2
feat: TO-DO Repository 구현
banjjak2 Apr 12, 2022
8ff7958
Merge pull request #46 from ku-kim/feature/Android/todo-repository
shncder Apr 13, 2022
0708b5a
[Android] Todo 화면 및 레포지토리 구현 (#52)
banjjak2 Apr 13, 2022
d53b0e6
refact: ViewModel을 하나로 통합
banjjak2 Apr 13, 2022
ca12af9
Merge pull request #54 from ku-kim/refact
banjjak2 Apr 13, 2022
b525960
refact: ServiceLocator 구현
banjjak2 Apr 14, 2022
2592d12
Merge pull request #56 from ku-kim/feature/Android/refact-servicelocator
banjjak2 Apr 14, 2022
b3ee3c3
chore: 피드백 적용 - 패키지명 언더바 제거
banjjak2 Apr 14, 2022
120d3b9
chore: MainActivity 테스트 코드를 뷰모델로 이동
banjjak2 Apr 14, 2022
4e18c86
chore: binding을 이용해 뷰를 참조하도록 수정
banjjak2 Apr 14, 2022
4860095
test: 테스트 코드 수정
banjjak2 Apr 14, 2022
808e8be
refact: ServiceLocator 구현
banjjak2 Apr 14, 2022
876466f
커밋 다시하기
shncder Apr 14, 2022
ffc8a97
강제푸쉬
shncder Apr 14, 2022
8d03a0d
Merge branch 'temp-develop-Android' into feature/Android/swipe
shncder Apr 14, 2022
cc6684d
Merge pull request #60 from ku-kim/feature/Android/swipe
banjjak2 Apr 14, 2022
c8ee247
Merge branch 'temp-develop-Android' of https://github.com/ku-kim/todo…
banjjak2 Apr 14, 2022
aebb967
목업서버에서 card가져오기 및 드래그 일부구현
shncder Apr 15, 2022
7509ee9
Merge pull request #61 from ku-kim/feature/Android/Task_viewmodel
banjjak2 Apr 15, 2022
eca685f
Merge branch 'temp-develop-Android' of https://github.com/ku-kim/todo…
banjjak2 Apr 15, 2022
f7e1087
refact: ViewModel을 하나로 통합
banjjak2 Apr 13, 2022
62748dc
feat: dialogFragment를 위한 리소스 생성
banjjak2 Apr 14, 2022
4d9487a
chore: DialogFragment 구성
banjjak2 Apr 14, 2022
d172fd1
feat: 텍스트 입력에 따라 버튼 enabled 처리
banjjak2 Apr 14, 2022
40ffbf6
refact: 리사이클러 뷰 설정 및 다이얼로그 호출 분리
banjjak2 Apr 14, 2022
ce71850
feat: 리얼 서버와 통신하기 위한 설정 및 구조 변경
banjjak2 Apr 14, 2022
8f86d0c
feat: 리얼 서버와 통신하기 위한 코드 변경 및 TODO 추가 기능 구현
banjjak2 Apr 14, 2022
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
refact: ServiceLocator 구현
banjjak2 committed Apr 14, 2022
commit b52596006d4bf63e0d91fa326b28112a62df0ccf
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.GravityCompat
import androidx.databinding.DataBindingUtil
import androidx.lifecycle.ViewModelProvider
import com.example.todo_list.data.TasksRepository
import com.example.todo_list.databinding.ActivityMainBinding
import com.example.todo_list.history.HistoryAdapter
import com.example.todo_list.tasks.data.Task
@@ -21,8 +20,8 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
super.onCreate(savedInstanceState)
binding = DataBindingUtil.setContentView(this, R.layout.activity_main)

tasksViewModel = ViewModelProvider(this, ViewModelFactory(TasksRepository())).get(
TasksViewModel::class.java)
val repository = ServiceLocator.provideRepository()
tasksViewModel = ViewModelProvider(this, ViewModelFactory(repository)).get(TasksViewModel::class.java)

val historyAdapter = HistoryAdapter()
binding.recyclerviewHistory.adapter = historyAdapter
14 changes: 14 additions & 0 deletions Android/app/src/main/java/com/example/todo_list/ServiceLocator.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.example.todo_list

import com.example.todo_list.data.Repository
import com.example.todo_list.data.TasksRepository

object ServiceLocator {
private var taskRepository: Repository? = null

fun provideRepository(): Repository {
synchronized(this) {
return taskRepository ?: taskRepository ?: TasksRepository()
}
}
}