Skip to content

Commit

Permalink
#86 refactor : global 패키지 위치 수정
Browse files Browse the repository at this point in the history
Co-authored-by: plashdof <[email protected]>
Co-authored-by: BENDENG1 <[email protected]>
  • Loading branch information
3 people committed Nov 28, 2023
1 parent 95fea17 commit 0a22ed4
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 20 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.avengers.nibobnebob.presentation.ui.global.mapper
package com.avengers.nibobnebob.presentation.ui.main.global.mapper

import com.avengers.nibobnebob.data.model.response.RestaurantDetailResponse
import com.avengers.nibobnebob.presentation.ui.global.model.UiRestaurantDetailData
import com.avengers.nibobnebob.presentation.ui.main.global.model.UiRestaurantDetailData

internal fun RestaurantDetailResponse.toUiRestaurantDetailInfo() = UiRestaurantDetailData(
name = name,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.avengers.nibobnebob.presentation.ui.global.model
package com.avengers.nibobnebob.presentation.ui.main.global.model

data class UiRestaurantDetailData(
val name : String,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.avengers.nibobnebob.presentation.ui.global.model
package com.avengers.nibobnebob.presentation.ui.main.global.model

data class UiReviewData(
val reviewId : Int,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.avengers.nibobnebob.presentation.ui.global.restaurantadd
package com.avengers.nibobnebob.presentation.ui.main.global.restaurantadd

import android.annotation.SuppressLint
import android.graphics.Color
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.avengers.nibobnebob.presentation.ui.global.restaurantadd
package com.avengers.nibobnebob.presentation.ui.main.global.restaurantadd

import android.os.Bundle
import android.view.View
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.avengers.nibobnebob.presentation.ui.global.restaurantadd
package com.avengers.nibobnebob.presentation.ui.main.global.restaurantadd

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.avengers.nibobnebob.presentation.ui.global.restaurantdetail
package com.avengers.nibobnebob.presentation.ui.main.global.restaurantdetail

import android.widget.ImageView
import androidx.databinding.BindingAdapter
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.avengers.nibobnebob.presentation.ui.global.restaurantdetail
package com.avengers.nibobnebob.presentation.ui.main.global.restaurantdetail

import android.os.Bundle
import android.view.View
Expand All @@ -9,7 +9,7 @@ import androidx.navigation.fragment.navArgs
import com.avengers.nibobnebob.R
import com.avengers.nibobnebob.databinding.FragmentRestaurantDetailBinding
import com.avengers.nibobnebob.presentation.base.BaseFragment
import com.avengers.nibobnebob.presentation.ui.global.restaurantdetail.adapter.RestaurantReviewAdapter
import com.avengers.nibobnebob.presentation.ui.main.global.restaurantdetail.adapter.RestaurantReviewAdapter
import com.avengers.nibobnebob.presentation.ui.main.MainViewModel
import dagger.hilt.android.AndroidEntryPoint

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.avengers.nibobnebob.presentation.ui.global.restaurantdetail
package com.avengers.nibobnebob.presentation.ui.main.global.restaurantdetail

import android.util.Log
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.avengers.nibobnebob.data.model.BaseState
import com.avengers.nibobnebob.data.repository.GlobalRepository
import com.avengers.nibobnebob.presentation.ui.global.mapper.toUiRestaurantDetailInfo
import com.avengers.nibobnebob.presentation.ui.global.model.UiReviewData
import com.avengers.nibobnebob.presentation.ui.main.global.mapper.toUiRestaurantDetailInfo
import com.avengers.nibobnebob.presentation.ui.main.global.model.UiReviewData
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.avengers.nibobnebob.presentation.ui.global.restaurantdetail.adapter
package com.avengers.nibobnebob.presentation.ui.main.global.restaurantdetail.adapter

import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import com.avengers.nibobnebob.databinding.ItemReviewListBinding
import com.avengers.nibobnebob.presentation.ui.global.model.UiReviewData
import com.avengers.nibobnebob.presentation.ui.main.global.model.UiReviewData

class RestaurantReviewAdapter : ListAdapter<UiReviewData, ReviewFilterViewHolder>(diffCallback) {
companion object {
Expand Down
2 changes: 1 addition & 1 deletion Aos/app/src/main/res/layout/fragment_add_my_restaurant.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<variable
name="vm"
type="com.avengers.nibobnebob.presentation.ui.global.restaurantadd.AddMyRestaurantViewModel" />
type="com.avengers.nibobnebob.presentation.ui.main.global.restaurantadd.AddMyRestaurantViewModel" />

</data>

Expand Down
2 changes: 1 addition & 1 deletion Aos/app/src/main/res/layout/fragment_restaurant_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<variable
name="vm"
type="com.avengers.nibobnebob.presentation.ui.global.restaurantdetail.RestaurantDetailViewModel" />
type="com.avengers.nibobnebob.presentation.ui.main.global.restaurantdetail.RestaurantDetailViewModel" />

</data>

Expand Down
2 changes: 1 addition & 1 deletion Aos/app/src/main/res/layout/item_review_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<variable
name="item"
type="com.avengers.nibobnebob.presentation.ui.global.model.UiReviewData" />
type="com.avengers.nibobnebob.presentation.ui.main.global.model.UiReviewData" />

</data>

Expand Down
4 changes: 2 additions & 2 deletions Aos/app/src/main/res/navigation/nav_graph.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
</fragment>
<fragment
android:id="@+id/addMyRestaurantFragment"
android:name="com.avengers.nibobnebob.presentation.ui.global.restaurantadd.AddMyRestaurantFragment"
android:name="com.avengers.nibobnebob.presentation.ui.main.global.restaurantadd.AddMyRestaurantFragment"
android:label="AddMyRestaurantFragment" >
<argument
android:name="restaurantName"
Expand All @@ -118,7 +118,7 @@

<fragment
android:id="@+id/restaurantDetailFragment"
android:name="com.avengers.nibobnebob.presentation.ui.global.restaurantdetail.RestaurantDetailFragment"
android:name="com.avengers.nibobnebob.presentation.ui.main.global.restaurantdetail.RestaurantDetailFragment"
android:label="RestaurantDetailFragment">
<argument
android:name="restaurantId"
Expand Down

0 comments on commit 0a22ed4

Please sign in to comment.