Skip to content

Commit bd15cd8

Browse files
koreatlwlskoreatlwls
committed
refactoring : layout 파일 네임 리팩토링
1 parent 00a9d23 commit bd15cd8

17 files changed

+28
-28
lines changed

‎presentation/src/main/java/com/stop/ui/route/RouteAdapter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import android.view.ViewGroup
55
import androidx.recyclerview.widget.DiffUtil
66
import androidx.recyclerview.widget.ListAdapter
77
import androidx.recyclerview.widget.RecyclerView
8-
import com.stop.databinding.RouteItemBinding
8+
import com.stop.databinding.ItemRouteBinding
99
import com.stop.domain.model.route.tmap.custom.Itinerary
1010

1111
class RouteAdapter(
1212
private val onItineraryClickListener: OnItineraryClickListener
1313
) : ListAdapter<Itinerary, RouteViewHolder>(diffUtil) {
1414

1515
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RouteViewHolder {
16-
val binding = RouteItemBinding.inflate(
16+
val binding = ItemRouteBinding.inflate(
1717
LayoutInflater.from(parent.context),
1818
parent,
1919
false

‎presentation/src/main/java/com/stop/ui/route/RouteViewHolder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import android.view.View
55
import androidx.core.content.ContextCompat
66
import androidx.recyclerview.widget.RecyclerView
77
import com.stop.R
8-
import com.stop.databinding.RouteItemBinding
8+
import com.stop.databinding.ItemRouteBinding
99
import com.stop.domain.model.route.tmap.custom.*
1010
import com.stop.model.route.RouteItem
1111
import com.stop.model.route.RouteItemType
1212

1313
class RouteViewHolder(
14-
private val binding: RouteItemBinding
14+
private val binding: ItemRouteBinding
1515
) : RecyclerView.ViewHolder(binding.root) {
1616

1717
private var routeItemColor = 0

‎presentation/src/main/java/com/stop/ui/route/StationContainer.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import android.view.LayoutInflater
66
import android.view.View
77
import androidx.constraintlayout.widget.ConstraintLayout
88
import androidx.constraintlayout.widget.ConstraintSet
9-
import com.stop.databinding.StationContainerItemBinding
9+
import com.stop.databinding.ItemStationContainerBinding
1010
import com.stop.model.route.RouteItem
1111

1212
class StationContainer(
@@ -19,7 +19,7 @@ class StationContainer(
1919
fun submitList(routeItems: List<RouteItem>) {
2020
clearBeforeData()
2121
routeItems.forEachIndexed { index, routeItem ->
22-
val stationContainerItemBinding = StationContainerItemBinding.inflate(
22+
val stationContainerItemBinding = ItemStationContainerBinding.inflate(
2323
LayoutInflater.from(context),
2424
this,
2525
true,
@@ -37,7 +37,7 @@ class StationContainer(
3737
}
3838

3939
private fun setBindingAttribute(
40-
binding: StationContainerItemBinding,
40+
binding: ItemStationContainerBinding,
4141
routeItem: RouteItem,
4242
index: Int
4343
) {
@@ -49,7 +49,7 @@ class StationContainer(
4949
}
5050
}
5151

52-
private fun setConstraint(binding: StationContainerItemBinding) {
52+
private fun setConstraint(binding: ItemStationContainerBinding) {
5353
val endId = beforeViewId ?: this.id
5454
val endSide = if (beforeViewId == null) {
5555
ConstraintSet.TOP

‎presentation/src/main/java/com/stop/ui/route/TimeLineContainer.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
1010
import androidx.constraintlayout.widget.ConstraintSet
1111
import androidx.core.content.ContextCompat
1212
import com.stop.R
13-
import com.stop.databinding.TimeLineItemBinding
13+
import com.stop.databinding.ItemTimeLineBinding
1414
import com.stop.domain.model.route.tmap.custom.MoveType
1515
import com.stop.domain.model.route.tmap.custom.Route
1616
import com.stop.domain.model.route.tmap.custom.TransportRoute
@@ -37,7 +37,7 @@ class TimeLineContainer(
3737
overlappingWidth = overlappingMarginPixel * (routes.size - 1)
3838

3939
routes.forEachIndexed { index, route ->
40-
val timeLineItem2Binding = TimeLineItemBinding.inflate(
40+
val timeLineItem2Binding = ItemTimeLineBinding.inflate(
4141
LayoutInflater.from(context),
4242
this@TimeLineContainer,
4343
true,
@@ -60,7 +60,7 @@ class TimeLineContainer(
6060
beforeView = null
6161
}
6262

63-
private fun setBindingAttribute(binding: TimeLineItemBinding, route: Route, index: Int) {
63+
private fun setBindingAttribute(binding: ItemTimeLineBinding, route: Route, index: Int) {
6464
val filterTime = if (routeCount < 7) {
6565
60.0
6666
} else {
@@ -118,7 +118,7 @@ class TimeLineContainer(
118118
}
119119

120120
private fun setConstraint(
121-
binding: TimeLineItemBinding,
121+
binding: ItemTimeLineBinding,
122122
index: Int,
123123
proportionOfSectionTime: Float,
124124
correctionValue: Float,
@@ -169,7 +169,7 @@ class TimeLineContainer(
169169
beforeViewId = binding.root.id
170170
}
171171

172-
private fun setIdentityColor(binding: TimeLineItemBinding, route: TransportRoute) {
172+
private fun setIdentityColor(binding: ItemTimeLineBinding, route: TransportRoute) {
173173
val identityColor = Color.parseColor("#${route.routeColor}")
174174

175175
binding.textViewSectionTime.background.setTint(identityColor)
@@ -179,7 +179,7 @@ class TimeLineContainer(
179179
binding.imageViewIcon.imageTintList = ColorStateList.valueOf(Color.WHITE)
180180
}
181181

182-
private fun setDefaultColor(binding: TimeLineItemBinding) {
182+
private fun setDefaultColor(binding: ItemTimeLineBinding) {
183183
binding.textViewSectionTime.background.setTint(greyColor)
184184
binding.textViewSectionTime.setTextColor(Color.WHITE)
185185

‎presentation/src/main/java/com/stop/ui/routedetail/RouteDetailAdapter.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ import androidx.databinding.ViewDataBinding
66
import androidx.recyclerview.widget.DiffUtil
77
import androidx.recyclerview.widget.ListAdapter
88
import androidx.recyclerview.widget.RecyclerView
9-
import com.stop.databinding.RouteFirstItemBinding
10-
import com.stop.databinding.RouteLastItemBinding
11-
import com.stop.databinding.RoutePathItemBinding
9+
import com.stop.databinding.ItemRouteFirstBinding
10+
import com.stop.databinding.ItemRouteLastBinding
11+
import com.stop.databinding.ItemRoutePathBinding
1212
import com.stop.model.route.RouteItem
1313
import com.stop.model.route.RouteItemType
1414

1515
class RouteDetailAdapter(
1616
private val onRouteItemClickListener: OnRouteItemClickListener
17-
): ListAdapter<RouteItem, RecyclerView.ViewHolder>(diffUtil) {
17+
) : ListAdapter<RouteItem, RecyclerView.ViewHolder>(diffUtil) {
1818

1919
class FirstViewHolder(
20-
private val binding: RouteFirstItemBinding
20+
private val binding: ItemRouteFirstBinding
2121
) : RecyclerView.ViewHolder(binding.root) {
2222
fun bind(routeItem: RouteItem) {
2323
binding.routeItem = routeItem
@@ -26,7 +26,7 @@ class RouteDetailAdapter(
2626
}
2727

2828
class PathViewHolder(
29-
private val binding: RoutePathItemBinding
29+
private val binding: ItemRoutePathBinding
3030
) : RecyclerView.ViewHolder(binding.root) {
3131
fun bind(routeItem: RouteItem) {
3232
binding.routeItem = routeItem
@@ -35,7 +35,7 @@ class RouteDetailAdapter(
3535
}
3636

3737
class LastViewHolder(
38-
private val binding: RouteLastItemBinding
38+
private val binding: ItemRouteLastBinding
3939
) : RecyclerView.ViewHolder(binding.root) {
4040
fun bind(routeItem: RouteItem) {
4141
binding.routeItem = routeItem
@@ -48,15 +48,15 @@ class RouteDetailAdapter(
4848
val inflater = LayoutInflater.from(parent.context)
4949
val viewHolder: RecyclerView.ViewHolder = when (viewType) {
5050
TYPE_FIRST -> {
51-
binding = RouteFirstItemBinding.inflate(inflater, parent, false)
51+
binding = ItemRouteFirstBinding.inflate(inflater, parent, false)
5252
FirstViewHolder(binding)
5353
}
5454
TYPE_PATH -> {
55-
binding = RoutePathItemBinding.inflate(inflater, parent, false)
55+
binding = ItemRoutePathBinding.inflate(inflater, parent, false)
5656
PathViewHolder(binding)
5757
}
5858
TYPE_LAST -> {
59-
binding = RouteLastItemBinding.inflate(inflater, parent, false)
59+
binding = ItemRouteLastBinding.inflate(inflater, parent, false)
6060
LastViewHolder(binding)
6161
}
6262
else -> throw IllegalArgumentException("Invalid ViewType")

‎presentation/src/main/res/layout/home_bottom_sheet.xml renamed to ‎presentation/src/main/res/layout/bottom_sheet_home.xml

File renamed without changes.

‎presentation/src/main/res/layout/route_detail_drawer.xml renamed to ‎presentation/src/main/res/layout/drawer_route_detail.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,6 @@
137137
app:layout_constraintTop_toBottomOf="@id/view_alarm"
138138
app:layout_constraintBottom_toBottomOf="parent"
139139
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
140-
tools:listitem="@layout/route_path_item" />
140+
tools:listitem="@layout/item_route_path" />
141141
</androidx.constraintlayout.widget.ConstraintLayout>
142142
</layout>

‎presentation/src/main/res/layout/fragment_map.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153

154154
<include
155155
android:id="@+id/home_bottom_sheet"
156-
layout="@layout/home_bottom_sheet"
156+
layout="@layout/bottom_sheet_home"
157157
android:layout_width="match_parent"
158158
android:layout_height="0dp"
159159
app:layout_constraintBottom_toBottomOf="parent"

‎presentation/src/main/res/layout/fragment_route.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
app:layout_constraintEnd_toStartOf="@id/guideline_end"
106106
app:layout_constraintStart_toStartOf="@id/guideline_start"
107107
app:layout_constraintTop_toBottomOf="@id/text_view_destination"
108-
tools:listitem="@layout/route_item" />
108+
tools:listitem="@layout/item_route" />
109109

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

‎presentation/src/main/res/layout/fragment_route_detail.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
android:layout_gravity="start"
145145
bind:routeResultViewModel="@{routeResultViewModel}"
146146
bind:itinerary="@{itinerary}"
147-
layout="@layout/route_detail_drawer" />
147+
layout="@layout/drawer_route_detail" />
148148
</androidx.drawerlayout.widget.DrawerLayout>
149149
</LinearLayout>
150150
</layout>

0 commit comments

Comments
 (0)