Skip to content

Commit 9125b4c

Browse files
committed
Feature | 데모 시연 준비용
1 parent f67edec commit 9125b4c

File tree

8 files changed

+143
-71
lines changed

8 files changed

+143
-71
lines changed

app/src/main/java/com/example/dongsan2mong/activity/ClusterActivity.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.example.dongsan2mong.activity
22

33
import android.content.Intent
4-
import androidx.appcompat.app.AppCompatActivity
54
import android.os.Bundle
65
import android.util.Log
6+
import androidx.appcompat.app.AppCompatActivity
77
import androidx.recyclerview.widget.LinearLayoutManager
88
import com.example.dongsan2mong.adapter.HouseInfoDataAdapter
99
import com.example.dongsan2mong.data.HouseInfoData
@@ -49,7 +49,7 @@ class ClusterActivity : AppCompatActivity() {
4949
type = "월세",
5050
price = realEstateData.deposit.toString().removeSuffix("0000") + "/" +
5151
realEstateData.monthlyPayment.toString().removeSuffix("0000"),
52-
space = realEstateData.roomSize.toString() + "^2",
52+
space = realEstateData.roomSize.toString() + "m^2",
5353
area = realEstateData.areaNumberAddress,
5454
roomNum = realEstateData.spaceType,
5555
imgURL = realEstateData.imgUrl

app/src/main/java/com/example/dongsan2mong/adapter/HouseInfoDataAdapter.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import com.example.dongsan2mong.R
88
import com.example.dongsan2mong.activity.MainActivity
99
import com.example.dongsan2mong.data.HouseInfoData
1010
import com.example.dongsan2mong.databinding.RowHouseinfoBinding
11-
import com.squareup.picasso.Picasso
1211

1312
class HouseInfoDataAdapter(val items: ArrayList<HouseInfoData>, val selected: ArrayList<Boolean>) :
1413
RecyclerView.Adapter<HouseInfoDataAdapter.ViewHolder>() {
@@ -72,7 +71,7 @@ class HouseInfoDataAdapter(val items: ArrayList<HouseInfoData>, val selected: Ar
7271
if (items[position].imgURL == "") {
7372
holder.binding.houseImg.setImageResource(R.drawable.img_house_1)
7473
} else {
75-
Picasso.get().load(items[position].imgURL).into(holder.binding.houseImg)
74+
holder.binding.houseImg.setImageResource(R.drawable.compare_house)
7675
}
7776

7877
holder.binding.apply {
@@ -81,7 +80,7 @@ class HouseInfoDataAdapter(val items: ArrayList<HouseInfoData>, val selected: Ar
8180
"onActivityResult",
8281
"seleceted? : ${favorite.isSelected}, position : $position"
8382
)
84-
if (favorite.isSelected == true) {
83+
if (favorite.isSelected) {
8584
favorite.isSelected = false
8685
favorite.setImageResource(R.drawable.icon_house_favorite_empty)
8786
dibshomeArr.remove(items[position])

app/src/main/java/com/example/dongsan2mong/adapter/PresetDataAdapter.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class PresetDataAdapter(val items: ArrayList<PresetInfoData>, val selected: Arra
8383
println(currentItem.freesetTitle)
8484
val context = holder.itemView.context
8585
if (context is MainActivity) {
86-
context.changeFragment(MapFragment.newInstance(currentItem))
86+
context.changeFragment(MapFragment())
8787
}
8888
}
8989

app/src/main/java/com/example/dongsan2mong/fragment/CallPresetFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class CallPresetFragment : Fragment(), PresetDataAdapter.OnApplyClickListener {
3434

3535
override fun onApplyClick(data: PresetInfoData) {
3636
// 이곳에서 data를 처리하거나 MainActivity의 MapFragment로 전달하는 로직을 추가하세요.
37-
val mapFragment = MapFragment.newInstance(data)
37+
val mapFragment = MapFragment()
3838
val mainActivity = requireActivity() as MainActivity
3939
mainActivity.changeFragment(mapFragment)
4040
}

app/src/main/java/com/example/dongsan2mong/fragment/DibshomeFragment.kt

+24-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.example.dongsan2mong.fragment
22

3-
import android.content.Context
43
import android.os.Bundle
54
import android.util.Log
65
import android.view.LayoutInflater
@@ -12,12 +11,12 @@ import com.example.dongsan2mong.adapter.HouseInfoDataAdapter
1211
import com.example.dongsan2mong.data.HouseInfoData
1312
import com.example.dongsan2mong.databinding.FragmentDibshomeBinding
1413
import com.example.dongsan2mong.databinding.RowHouseinfoBinding
15-
import com.example.dongsan2mong.event.*
14+
import com.example.dongsan2mong.event.DataEvent
1615
import org.greenrobot.eventbus.EventBus
1716
import org.greenrobot.eventbus.Subscribe
1817
import org.greenrobot.eventbus.ThreadMode
1918

20-
class DibshomeFragment: Fragment() {
19+
class DibshomeFragment : Fragment() {
2120

2221
lateinit var binding: FragmentDibshomeBinding
2322
lateinit var adapter: HouseInfoDataAdapter
@@ -38,7 +37,26 @@ class DibshomeFragment: Fragment() {
3837
}
3938

4039
fun initData() {
41-
40+
data.add(
41+
HouseInfoData(
42+
type = "월세",
43+
price = "2000/40",
44+
space = "33.05m^2",
45+
area = "서울특별시 광진구 중곡동 23",
46+
roomNum = "투룸",
47+
imgURL = "https://dabang-prod-profile-image.s3.amazonaws.com/b20ec5e52785d80bff716f0e5cd97350"
48+
)
49+
)
50+
data.add(
51+
HouseInfoData(
52+
type = "월세",
53+
price = "500/25",
54+
space = "19.83m^2",
55+
area = "서울특별시 광진구 중곡동 23",
56+
roomNum = "원룸",
57+
imgURL = "https://dabang-prod-profile-image.s3.amazonaws.com/b20ec5e52785d80bff716f0e5cd97350"
58+
)
59+
)
4260
}
4361

4462
fun initRecyclerView() {
@@ -59,6 +77,7 @@ class DibshomeFragment: Fragment() {
5977
binding.recyclerViewDibshome.adapter = adapter
6078

6179
}
80+
6281
override fun onResume() {
6382
super.onResume()
6483
try {
@@ -78,8 +97,7 @@ class DibshomeFragment: Fragment() {
7897
fun printData(event: DataEvent) {
7998
if (event.int == 6) {
8099
Log.d("dataEvent", "wishlist to dibshome")
81-
}
82-
else if (event.int == 8) {
100+
} else if (event.int == 8) {
83101
Log.d("dataEvent", "latesthome to dibshome")
84102
}
85103
}

app/src/main/java/com/example/dongsan2mong/fragment/LatesthomeFragment.kt

+2-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.example.dongsan2mong.fragment
22

3-
import android.content.Context
43
import android.os.Bundle
54
import android.util.Log
65
import android.view.LayoutInflater
@@ -12,7 +11,7 @@ import com.example.dongsan2mong.adapter.HouseInfoDataAdapter
1211
import com.example.dongsan2mong.data.HouseInfoData
1312
import com.example.dongsan2mong.databinding.FragmentLatesthomeBinding
1413
import com.example.dongsan2mong.databinding.RowHouseinfoBinding
15-
import com.example.dongsan2mong.event.*
14+
import com.example.dongsan2mong.event.DataEvent
1615
import org.greenrobot.eventbus.EventBus
1716
import org.greenrobot.eventbus.Subscribe
1817
import org.greenrobot.eventbus.ThreadMode
@@ -35,18 +34,6 @@ class LatesthomeFragment : Fragment() {
3534
}
3635

3736
fun initData() {
38-
data.add(HouseInfoData())
39-
data.add(
40-
HouseInfoData(
41-
type = "월세",
42-
price = "500/74",
43-
space = "33.06m^2",
44-
floor = "1층",
45-
area = "광진구 구의동",
46-
roomNum = "투룸",
47-
imgURL = ""
48-
)
49-
)
5037
}
5138

5239
fun initRecyclerView() {
@@ -87,8 +74,7 @@ class LatesthomeFragment : Fragment() {
8774
fun printData(event: DataEvent) {
8875
if (event.int == 4) {
8976
Log.d("dataEvent", "wishlist to latesthome")
90-
}
91-
else if (event.int == 9) {
77+
} else if (event.int == 9) {
9278
Log.d("dataEvent", "dibshome to latesthome")
9379
}
9480
}

app/src/main/res/layout/fragment_dibshome.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
android:layout_height="wrap_content"
1010
android:layout_gravity="center"
1111
android:src="@drawable/text_nodibshome"
12-
android:visibility="visible" />
12+
android:visibility="gone" />
1313

1414

1515
<androidx.recyclerview.widget.RecyclerView

0 commit comments

Comments
 (0)