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.

Sign up for GitHub

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

#16 [ui] 홈 / to do 리사이클러뷰 #20

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

#16 [ui] 홈 / to do 리사이클러뷰 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5f7f4ea
#16 [ui] 어댑터와 리사이클러뷰 연결
2zerozu Jul 8, 2022
5108078
#16 [ui] ToDo 어댑터 생성
2zerozu Jul 8, 2022
f8cf833
#16 [ui] ToDo Data클래스 생성
2zerozu Jul 8, 2022
e468ee6
#16 [ui] ToDo 아이템 생성
2zerozu Jul 8, 2022
6172448
#16 [chore] 들여쓰기 관리
2zerozu Jul 8, 2022
beb5a7c
#16 [chore] ToDoData 집어넣기
2zerozu Jul 8, 2022
0a128bf
#16 [chore] 오타 수정
2zerozu Jul 8, 2022
bd80b49
#16 [ui] fragment_home에 ToDo 추가
2zerozu Jul 8, 2022
11ac57d
#16 [ui] to do 체크박스 selector 생성
2zerozu Jul 8, 2022
c659eb3
#16 [fix] to do 이미지뷰 체크박스로 수정
2zerozu Jul 8, 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
21 changes: 15 additions & 6 deletions app/src/main/java/com/hous/housaoslab/ui/home/HomeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@ import android.view.ViewGroup
import androidx.fragment.app.Fragment
import com.hous.housaoslab.R
import com.hous.housaoslab.databinding.FragmentHomeBinding
import com.hous.housaoslab.ui.home.model.ComingUpAdapter
import com.hous.housaoslab.ui.home.model.ComingUpData
import com.hous.housaoslab.ui.home.model.RulesAdapter
import com.hous.housaoslab.ui.home.model.RulesData
import com.hous.housaoslab.ui.home.model.*

class HomeFragment : Fragment() {
private var _binding: FragmentHomeBinding? = null
val binding get() = _binding!!
private lateinit var comingUpAdapter: ComingUpAdapter
private lateinit var rulesAdapter: RulesAdapter
private lateinit var toDoAdapter: ToDoAdapter

override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
_binding = FragmentHomeBinding.inflate(inflater, container, false)
Expand All @@ -32,7 +30,6 @@ class HomeFragment : Fragment() {
private fun initAdapter() {
comingUpAdapter = ComingUpAdapter()
binding.rvHomeComingUp.adapter = comingUpAdapter

comingUpAdapter.comingUpList.addAll(
listOf(
ComingUpData(R.drawable.shape_yellow_bg_fill_16_rectangle, R.drawable.img_coming_up_plus, "D-1"),
Expand All @@ -50,7 +47,6 @@ class HomeFragment : Fragment() {

rulesAdapter = RulesAdapter()
binding.rvHomeRules.adapter = rulesAdapter

rulesAdapter.rulesList.addAll(
listOf(
RulesData("00시~ 불 끄기!"),
Expand All @@ -61,5 +57,18 @@ class HomeFragment : Fragment() {
)
)
comingUpAdapter.notifyDataSetChanged()

toDoAdapter = ToDoAdapter()
binding.rvHomeToDo.adapter = toDoAdapter
toDoAdapter.toDoList.addAll(
listOf(
ToDoData("퇴근하고 마트"),
ToDoData("저녁 설거지"),
ToDoData("아침 설거지"),
ToDoData("물 사기"),
ToDoData("야식 먹지 말자"),
)
)
comingUpAdapter.notifyDataSetChanged()
}
}
34 changes: 34 additions & 0 deletions app/src/main/java/com/hous/housaoslab/ui/home/model/ToDoAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.hous.housaoslab.ui.home.model

import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
import com.hous.housaoslab.databinding.ItemHomeToDoBinding

class ToDoAdapter : RecyclerView.Adapter<ToDoAdapter.ToDoViewHolder>() {
val toDoList = mutableListOf<ToDoData>()
Comment on lines +7 to +9
Copy link
Member

Choose a reason for hiding this comment

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

adapter는 model 패키지 보다 home 패키지 안에 있는 것이 좋을 것 같습니다

Copy link
Member

Choose a reason for hiding this comment

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

아 맞아 이거 말해주고 싶었는데 ㅋㅋㅋ
첨언으로 model패키지는 ui패키지가 아니라 data패키지에 넣어주시면 좋을 것 같슴니다!!
MainActivity도 ui.home이 아닌 ui패키지에 넣어주시면 좋을 것 같숩니다 ㅎ ㅅ ㅎ


override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ToDoViewHolder {
val binding =
ItemHomeToDoBinding.inflate(
LayoutInflater.from(parent.context),
parent,
false
)
return ToDoViewHolder(binding)
}

override fun onBindViewHolder(holder: ToDoViewHolder, position: Int) {
holder.onBind(toDoList[position])
}

override fun getItemCount(): Int = toDoList.size

class ToDoViewHolder(
private val binding: ItemHomeToDoBinding
) : RecyclerView.ViewHolder(binding.root) {
fun onBind(data: ToDoData) {
binding.tvHomeToDo.text = data.rules
}
}
Comment on lines +27 to +33
Copy link
Member

Choose a reason for hiding this comment

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

item 쪽엔 data로 variable을 받는다고 선언했지만 사용하지 않았으며,
data class가 한개 일 때 굳이 data class를 만들지 않아도 String을 사용해도 recyclerview 동작이 가능합니다

현재로선 후자의 방식이 나아 보이지만, api가 나오면 data class 중 하나의 값을 바인딩할 것 같으니
전자의 방식으로 수정해주시면 좋을 것 같습니다

Copy link
Member

Choose a reason for hiding this comment

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

데이터바인딩을 사용해주세요!! ㅋㅋㅋㅋ

}
5 changes: 5 additions & 0 deletions app/src/main/java/com/hous/housaoslab/ui/home/model/ToDoData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.hous.housaoslab.ui.home.model

data class ToDoData(
val rules: String
)
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/ic_blue_fill_check_box.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#5E9EFF"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z" />
</vector>
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/ic_blue_line_check_box.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#5E9EFF"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z" />
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/sel_home_to_do_check_box.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_blue_line_check_box" android:state_checked="false" />
<item android:drawable="@drawable/ic_blue_fill_check_box" android:state_checked="true" />
</selector>
31 changes: 30 additions & 1 deletion app/src/main/res/layout/fragment_home.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_home_rules"
android:layout_width="165dp"
android:layout_width="170dp"
android:layout_height="172dp"
Comment on lines +59 to 60
Copy link
Member

Choose a reason for hiding this comment

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

wrap과 0dp를 사용해서 container 크기를 조정해주세요!!

android:layout_marginTop="12dp"
android:background="@drawable/shape_blue_bg_fill_16_rectangle"
Expand All @@ -70,5 +70,34 @@
app:layout_constraintTop_toBottomOf="@id/tv_home_rules"
tools:listitem="@layout/item_home_rules" />

<TextView
android:id="@+id/tv_home_to_do"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="28dp"
android:text="@string/home_to_do"
android:textColor="@color/black"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@id/rv_home_to_do"
app:layout_constraintTop_toBottomOf="@id/rv_home_coming_up" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_home_to_do"
android:layout_width="170dp"
android:layout_height="172dp"
Comment on lines +87 to +88
Copy link
Member

Choose a reason for hiding this comment

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

여기두요!!

android:layout_marginTop="12dp"
android:layout_marginEnd="20dp"
android:background="@drawable/shape_blue_bg_fill_16_rectangle"
android:orientation="vertical"
android:overScrollMode="never"
android:paddingHorizontal="20dp"
android:paddingTop="12dp"
android:paddingBottom="20dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_home_to_do"
tools:listitem="@layout/item_home_to_do" />

</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
42 changes: 42 additions & 0 deletions app/src/main/res/layout/item_home_to_do.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">

<data>

<variable
name="todoData"
type="com.hous.housaoslab.ui.home.model.ToDoData" />
</data>

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="9dp">

<CheckBox
android:id="@+id/cb_home_to_do"
android:layout_width="16dp"
android:layout_height="16dp"
Comment on lines +20 to +21
Copy link
Member

Choose a reason for hiding this comment

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

여기도 wrap_content나 0dp 사용하기!

android:background="@drawable/sel_home_to_do_check_box"
android:button="@android:color/transparent"
android:checked="false"
app:layout_constraintBottom_toBottomOf="@id/tv_home_to_do"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_home_to_do" />

<TextView
android:id="@+id/tv_home_to_do"
Comment on lines +28 to +30
Copy link
Member

Choose a reason for hiding this comment

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

현재 fragment_home 에도 tv_home_to_do 라는 id가 사용되고 있습니다.
type_where_what 중 where 쪽을 구분해야 될 것 같습니다

Copy link
Member

Choose a reason for hiding this comment

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

한가지 궁금한 점이 다른 layout인데 textView id값앞에 where을 다르게 해야하는 이유가 있을까요??

Copy link
Member

Choose a reason for hiding this comment

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

@murjune 일단 늦어서 죄송합니다.
layout id를 달리하는 이유는 제가 안드로이드 처음 공부할 때 findVIewById 를 사용하다가 다른 레이아웃에 id가 같아서 오류가 생긴 기억 때문에 항상 그렇게 했습니다.

형 말 듣고 생각해보니까, dataBinding, ViewBinding 은 한 레이아웃만 보니까 굳이 달라야 할 이유가 없네요...?
그래서 컨벤션에 where 빼도 될 것 같다는 생각이 드네요..? 제가 컨벤션에 where은 넣을렸던 이유는 where을 넣으면 id 중복을 피할 수 있을 것 같다는 생각했기 때문에 넣었거든요..

다른분들 생각은 어떤가요??

android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:textColor="@color/black"
android:textSize="13sp"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@id/cb_home_to_do"
app:layout_constraintTop_toTopOf="parent"
tools:text="청소기 돌리기" />

</androidx.constraintlayout.widget.ConstraintLayout>
</layout>