Skip to content

Commit 26ba953

Browse files
kimhm0728kimhm0728
authored
refactor: 전체적인 패키지 구조 변경 (#977)
* chore: presentation -> presentation/feature 패키지 이동 * chore: data 패키지 구조 변경 - retrofit 패키지를 remote로 이동 - local, remote repository 패키지를 data 패키지 하위에 이동 * chore: data 패키지 구조 변경 - retrofit 패키지를 remote로 이동 - local, remote repository 패키지를 data 패키지 하위에 이동 * style: ktLint 적용
1 parent 8a42576 commit 26ba953

File tree

143 files changed

+336
-332
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+336
-332
lines changed

‎android/app/src/androidTest/java/com/mulberry/ody/presentation/creation/MeetingCreationActivityTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
1414
import androidx.test.ext.junit.rules.ActivityScenarioRule
1515
import androidx.test.ext.junit.runners.AndroidJUnit4
1616
import com.mulberry.ody.R
17+
import com.mulberry.ody.presentation.feature.creation.MeetingCreationActivity
1718
import org.junit.Rule
1819
import org.junit.Test
1920
import org.junit.runner.RunWith

‎android/app/src/androidTest/java/com/mulberry/ody/presentation/invitecode/InviteCodeActivityTest.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,18 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
1414
import androidx.test.ext.junit.rules.ActivityScenarioRule
1515
import androidx.test.ext.junit.runners.AndroidJUnit4
1616
import com.mulberry.ody.R
17+
import com.mulberry.ody.presentation.feature.invitecode.InviteCodeActivity
1718
import org.junit.Rule
1819
import org.junit.Test
1920
import org.junit.runner.RunWith
2021

2122
@RunWith(AndroidJUnit4::class)
2223
class InviteCodeActivityTest {
2324
@get:Rule
24-
val activityRule: ActivityScenarioRule<InviteCodeActivity> = ActivityScenarioRule(InviteCodeActivity::class.java)
25+
val activityRule: ActivityScenarioRule<InviteCodeActivity> =
26+
ActivityScenarioRule(
27+
InviteCodeActivity::class.java,
28+
)
2529

2630
@Test
2731
fun `아무것도_입력하지_않으면_확인_버튼이_비활성화_된다`() {

‎android/app/src/main/AndroidManifest.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
tools:node="remove" />
4545

4646
<activity
47-
android:name=".presentation.splash.SplashActivity"
47+
android:name=".presentation.feature.splash.SplashActivity"
4848
android:exported="true"
4949
android:screenOrientation="portrait"
5050
android:theme="@style/AppTheme.Splash">
@@ -55,11 +55,11 @@
5555
</intent-filter>
5656
</activity>
5757
<activity
58-
android:name=".presentation.setting.SettingActivity"
58+
android:name=".presentation.feature.setting.SettingActivity"
5959
android:exported="false"
6060
android:screenOrientation="portrait" />
6161
<activity
62-
android:name=".presentation.login.LoginActivity"
62+
android:name=".presentation.feature.login.LoginActivity"
6363
android:exported="false"
6464
android:screenOrientation="portrait">
6565
<intent-filter>
@@ -72,32 +72,32 @@
7272
</intent-filter>
7373
</activity>
7474
<activity
75-
android:name=".presentation.meetings.MeetingsActivity"
75+
android:name=".presentation.feature.meetings.MeetingsActivity"
7676
android:exported="false"
7777
android:screenOrientation="portrait" />
7878
<activity
79-
android:name=".presentation.invitecode.InviteCodeActivity"
79+
android:name=".presentation.feature.invitecode.InviteCodeActivity"
8080
android:exported="false"
8181
android:screenOrientation="portrait"
8282
android:windowSoftInputMode="adjustResize" />
8383
<activity
84-
android:name=".presentation.join.MeetingJoinActivity"
84+
android:name=".presentation.feature.join.MeetingJoinActivity"
8585
android:exported="false"
8686
android:screenOrientation="portrait"
8787
android:windowSoftInputMode="adjustResize" />
8888
<activity
89-
android:name=".presentation.join.complete.JoinCompleteActivity"
89+
android:name=".presentation.feature.join.complete.JoinCompleteActivity"
9090
android:exported="false"
9191
android:screenOrientation="portrait" />
9292
<activity
93-
android:name=".presentation.creation.MeetingCreationActivity"
93+
android:name=".presentation.feature.creation.MeetingCreationActivity"
9494
android:exported="false"
9595
android:screenOrientation="portrait"
9696
android:windowSoftInputMode="adjustResize" />
9797
<activity
98-
android:name=".presentation.room.MeetingRoomActivity"
98+
android:name=".presentation.feature.room.MeetingRoomActivity"
9999
android:exported="false"
100-
android:parentActivityName=".presentation.meetings.MeetingsActivity"
100+
android:parentActivityName=".presentation.feature.meetings.MeetingsActivity"
101101
android:screenOrientation="portrait" />
102102
<activity
103103
android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"

‎android/app/src/main/java/com/mulberry/ody/data/local/service/EtaDashboardNotification.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import android.content.Intent
99
import android.media.RingtoneManager
1010
import androidx.core.app.NotificationCompat
1111
import com.mulberry.ody.R
12-
import com.mulberry.ody.presentation.meetings.MeetingsActivity
12+
import com.mulberry.ody.presentation.feature.meetings.MeetingsActivity
1313
import javax.inject.Inject
1414

1515
class EtaDashboardNotification

‎android/app/src/main/java/com/mulberry/ody/data/retrofit/AccessTokenInterceptor.kt ‎android/app/src/main/java/com/mulberry/ody/data/remote/retrofit/AccessTokenInterceptor.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.data.retrofit
1+
package com.mulberry.ody.data.remote.retrofit
22

33
import com.mulberry.ody.data.local.db.OdyDatastore
44
import com.mulberry.ody.data.remote.core.entity.login.mapper.toAuthToken

‎android/app/src/main/java/com/mulberry/ody/data/retrofit/ApiResultCall.kt ‎android/app/src/main/java/com/mulberry/ody/data/remote/retrofit/ApiResultCall.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.data.retrofit
1+
package com.mulberry.ody.data.remote.retrofit
22

33
import com.mulberry.ody.data.remote.core.entity.ErrorResponse
44
import com.mulberry.ody.domain.apiresult.ApiResult

‎android/app/src/main/java/com/mulberry/ody/data/retrofit/ApiResultCallAdapter.kt ‎android/app/src/main/java/com/mulberry/ody/data/remote/retrofit/ApiResultCallAdapter.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.data.retrofit
1+
package com.mulberry.ody.data.remote.retrofit
22

33
import com.mulberry.ody.domain.apiresult.ApiResult
44
import retrofit2.Call

‎android/app/src/main/java/com/mulberry/ody/data/retrofit/RefreshTokenInterceptor.kt ‎android/app/src/main/java/com/mulberry/ody/data/remote/retrofit/RefreshTokenInterceptor.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.data.retrofit
1+
package com.mulberry.ody.data.remote.retrofit
22

33
import com.mulberry.ody.data.local.db.OdyDatastore
44
import com.mulberry.ody.domain.model.AuthToken

‎android/app/src/main/java/com/mulberry/ody/data/remote/core/repository/DefaultJoinRepository.kt ‎android/app/src/main/java/com/mulberry/ody/data/repository/DefaultJoinRepository.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.data.remote.core.repository
1+
package com.mulberry.ody.data.repository
22

33
import com.mulberry.ody.data.remote.core.entity.join.mapper.toJoinRequest
44
import com.mulberry.ody.data.remote.core.entity.join.mapper.toReserveInfo

‎android/app/src/main/java/com/mulberry/ody/data/local/repository/DefaultMatesEtaRepository.kt ‎android/app/src/main/java/com/mulberry/ody/data/repository/DefaultMatesEtaRepository.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.data.local.repository
1+
package com.mulberry.ody.data.repository
22

33
import android.content.Context
44
import com.mulberry.ody.data.local.db.EtaReservationDao

‎android/app/src/main/java/com/mulberry/ody/data/remote/core/repository/DefaultMeetingRepository.kt ‎android/app/src/main/java/com/mulberry/ody/data/repository/DefaultMeetingRepository.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.data.remote.core.repository
1+
package com.mulberry.ody.data.repository
22

33
import com.mulberry.ody.data.local.db.MateEtaInfoDao
44
import com.mulberry.ody.data.local.entity.eta.MateEtaInfoEntity

‎android/app/src/main/java/com/mulberry/ody/data/remote/core/repository/DefaultNotificationLogRepository.kt ‎android/app/src/main/java/com/mulberry/ody/data/repository/DefaultNotificationLogRepository.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.data.remote.core.repository
1+
package com.mulberry.ody.data.repository
22

33
import com.mulberry.ody.data.remote.core.entity.notification.mapper.toNotificationList
44
import com.mulberry.ody.data.remote.core.service.NotificationService

‎android/app/src/main/java/com/mulberry/ody/data/remote/thirdparty/address/KakaoAddressRepository.kt ‎android/app/src/main/java/com/mulberry/ody/data/repository/KakaoAddressRepository.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package com.mulberry.ody.data.remote.thirdparty.address
1+
package com.mulberry.ody.data.repository
22

3+
import com.mulberry.ody.data.remote.thirdparty.address.KakaoAddressService
34
import com.mulberry.ody.data.remote.thirdparty.address.response.toAddresses
45
import com.mulberry.ody.domain.apiresult.ApiResult
56
import com.mulberry.ody.domain.apiresult.map

‎android/app/src/main/java/com/mulberry/ody/di/NetworkModule.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package com.mulberry.ody.di
33
import com.mulberry.ody.BuildConfig
44
import com.mulberry.ody.data.local.db.OdyDatastore
55
import com.mulberry.ody.data.remote.core.service.RefreshTokenService
6-
import com.mulberry.ody.data.retrofit.AccessTokenInterceptor
7-
import com.mulberry.ody.data.retrofit.ApiResultCallAdapter
8-
import com.mulberry.ody.data.retrofit.RefreshTokenInterceptor
6+
import com.mulberry.ody.data.remote.retrofit.AccessTokenInterceptor
7+
import com.mulberry.ody.data.remote.retrofit.ApiResultCallAdapter
8+
import com.mulberry.ody.data.remote.retrofit.RefreshTokenInterceptor
99
import com.squareup.moshi.Moshi
1010
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
1111
import dagger.Module

‎android/app/src/main/java/com/mulberry/ody/di/RepositoryModule.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.mulberry.ody.di
22

33
import com.mulberry.ody.data.auth.repository.KakaoAuthRepository
4-
import com.mulberry.ody.data.local.repository.DefaultMatesEtaRepository
5-
import com.mulberry.ody.data.remote.core.repository.DefaultJoinRepository
6-
import com.mulberry.ody.data.remote.core.repository.DefaultMeetingRepository
7-
import com.mulberry.ody.data.remote.core.repository.DefaultNotificationLogRepository
8-
import com.mulberry.ody.data.remote.thirdparty.address.KakaoAddressRepository
4+
import com.mulberry.ody.data.repository.DefaultJoinRepository
5+
import com.mulberry.ody.data.repository.DefaultMatesEtaRepository
6+
import com.mulberry.ody.data.repository.DefaultMeetingRepository
7+
import com.mulberry.ody.data.repository.DefaultNotificationLogRepository
8+
import com.mulberry.ody.data.repository.KakaoAddressRepository
99
import com.mulberry.ody.domain.repository.location.AddressRepository
1010
import com.mulberry.ody.domain.repository.ody.AuthRepository
1111
import com.mulberry.ody.domain.repository.ody.JoinRepository

‎android/app/src/main/java/com/mulberry/ody/presentation/LifecycleExtensions.kt ‎android/app/src/main/java/com/mulberry/ody/presentation/common/LifecycleExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.presentation
1+
package com.mulberry.ody.presentation.common
22

33
import androidx.appcompat.app.AppCompatActivity
44
import androidx.fragment.app.Fragment

‎android/app/src/main/java/com/mulberry/ody/presentation/address/AddressSearchFragment.kt ‎android/app/src/main/java/com/mulberry/ody/presentation/feature/address/AddressSearchFragment.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.presentation.address
1+
package com.mulberry.ody.presentation.feature.address
22

33
import android.os.Bundle
44
import android.view.KeyEvent
@@ -10,12 +10,12 @@ import androidx.fragment.app.viewModels
1010
import com.google.android.material.divider.MaterialDividerItemDecoration
1111
import com.mulberry.ody.R
1212
import com.mulberry.ody.databinding.FragmentAddressSearchBinding
13-
import com.mulberry.ody.presentation.address.adapter.AddressesAdapter
14-
import com.mulberry.ody.presentation.address.listener.AddressSearchListener
15-
import com.mulberry.ody.presentation.collectWhenStarted
1613
import com.mulberry.ody.presentation.common.binding.BindingFragment
14+
import com.mulberry.ody.presentation.common.collectWhenStarted
1715
import com.mulberry.ody.presentation.common.listener.BackListener
1816
import com.mulberry.ody.presentation.common.toPixel
17+
import com.mulberry.ody.presentation.feature.address.adapter.AddressesAdapter
18+
import com.mulberry.ody.presentation.feature.address.listener.AddressSearchListener
1919
import dagger.hilt.android.AndroidEntryPoint
2020

2121
@AndroidEntryPoint

‎android/app/src/main/java/com/mulberry/ody/presentation/address/AddressSearchViewModel.kt ‎android/app/src/main/java/com/mulberry/ody/presentation/feature/address/AddressSearchViewModel.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.presentation.address
1+
package com.mulberry.ody.presentation.feature.address
22

33
import androidx.lifecycle.viewModelScope
44
import androidx.paging.Pager
@@ -9,8 +9,8 @@ import com.mulberry.ody.data.remote.thirdparty.address.AddressPagingSource
99
import com.mulberry.ody.data.remote.thirdparty.address.AddressPagingSource.Companion.PAGE_SIZE
1010
import com.mulberry.ody.domain.model.Address
1111
import com.mulberry.ody.domain.repository.location.AddressRepository
12-
import com.mulberry.ody.presentation.address.listener.AddressListener
1312
import com.mulberry.ody.presentation.common.BaseViewModel
13+
import com.mulberry.ody.presentation.feature.address.listener.AddressListener
1414
import dagger.hilt.android.lifecycle.HiltViewModel
1515
import kotlinx.coroutines.flow.MutableSharedFlow
1616
import kotlinx.coroutines.flow.MutableStateFlow

‎android/app/src/main/java/com/mulberry/ody/presentation/address/adapter/AddressesAdapter.kt ‎android/app/src/main/java/com/mulberry/ody/presentation/feature/address/adapter/AddressesAdapter.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package com.mulberry.ody.presentation.address.adapter
1+
package com.mulberry.ody.presentation.feature.address.adapter
22

33
import android.view.LayoutInflater
44
import android.view.ViewGroup
55
import androidx.paging.PagingDataAdapter
66
import androidx.recyclerview.widget.DiffUtil
77
import com.mulberry.ody.databinding.ItemAddressSearchBinding
88
import com.mulberry.ody.domain.model.Address
9-
import com.mulberry.ody.presentation.address.listener.AddressListener
10-
import com.mulberry.ody.presentation.address.listener.AddressViewHolder
9+
import com.mulberry.ody.presentation.feature.address.listener.AddressListener
10+
import com.mulberry.ody.presentation.feature.address.listener.AddressViewHolder
1111

1212
class AddressesAdapter(
1313
private val addressListener: AddressListener,

‎android/app/src/main/java/com/mulberry/ody/presentation/address/listener/AddressListener.kt ‎android/app/src/main/java/com/mulberry/ody/presentation/feature/address/listener/AddressListener.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.presentation.address.listener
1+
package com.mulberry.ody.presentation.feature.address.listener
22

33
import com.mulberry.ody.domain.model.Address
44

‎android/app/src/main/java/com/mulberry/ody/presentation/address/listener/AddressSearchListener.kt ‎android/app/src/main/java/com/mulberry/ody/presentation/feature/address/listener/AddressSearchListener.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.presentation.address.listener
1+
package com.mulberry.ody.presentation.feature.address.listener
22

33
import com.mulberry.ody.domain.model.Address
44

‎android/app/src/main/java/com/mulberry/ody/presentation/address/listener/AddressViewHolder.kt ‎android/app/src/main/java/com/mulberry/ody/presentation/feature/address/listener/AddressViewHolder.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.presentation.address.listener
1+
package com.mulberry.ody.presentation.feature.address.listener
22

33
import androidx.recyclerview.widget.RecyclerView
44
import com.mulberry.ody.databinding.ItemAddressSearchBinding

‎android/app/src/main/java/com/mulberry/ody/presentation/creation/MeetingCreationActivity.kt ‎android/app/src/main/java/com/mulberry/ody/presentation/feature/creation/MeetingCreationActivity.kt

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.presentation.creation
1+
package com.mulberry.ody.presentation.feature.creation
22

33
import android.content.Context
44
import android.content.Intent
@@ -10,17 +10,17 @@ import androidx.fragment.app.commit
1010
import com.mulberry.ody.R
1111
import com.mulberry.ody.databinding.ActivityMeetingCreationBinding
1212
import com.mulberry.ody.domain.model.Address
13-
import com.mulberry.ody.presentation.address.AddressSearchFragment
14-
import com.mulberry.ody.presentation.address.listener.AddressSearchListener
15-
import com.mulberry.ody.presentation.collectWhenStarted
1613
import com.mulberry.ody.presentation.common.ViewPagerAdapter
1714
import com.mulberry.ody.presentation.common.binding.BindingActivity
15+
import com.mulberry.ody.presentation.common.collectWhenStarted
1816
import com.mulberry.ody.presentation.common.listener.BackListener
19-
import com.mulberry.ody.presentation.creation.date.MeetingDateFragment
20-
import com.mulberry.ody.presentation.creation.destination.MeetingDestinationFragment
21-
import com.mulberry.ody.presentation.creation.name.MeetingNameFragment
22-
import com.mulberry.ody.presentation.creation.time.MeetingTimeFragment
23-
import com.mulberry.ody.presentation.join.MeetingJoinActivity
17+
import com.mulberry.ody.presentation.feature.address.AddressSearchFragment
18+
import com.mulberry.ody.presentation.feature.address.listener.AddressSearchListener
19+
import com.mulberry.ody.presentation.feature.creation.date.MeetingDateFragment
20+
import com.mulberry.ody.presentation.feature.creation.destination.MeetingDestinationFragment
21+
import com.mulberry.ody.presentation.feature.creation.name.MeetingNameFragment
22+
import com.mulberry.ody.presentation.feature.creation.time.MeetingTimeFragment
23+
import com.mulberry.ody.presentation.feature.join.MeetingJoinActivity
2424
import dagger.hilt.android.AndroidEntryPoint
2525

2626
@AndroidEntryPoint

‎android/app/src/main/java/com/mulberry/ody/presentation/creation/MeetingCreationInfoType.kt ‎android/app/src/main/java/com/mulberry/ody/presentation/feature/creation/MeetingCreationInfoType.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.presentation.creation
1+
package com.mulberry.ody.presentation.feature.creation
22

33
enum class MeetingCreationInfoType {
44
NAME,

‎android/app/src/main/java/com/mulberry/ody/presentation/creation/MeetingCreationNavigateAction.kt ‎android/app/src/main/java/com/mulberry/ody/presentation/feature/creation/MeetingCreationNavigateAction.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.presentation.creation
1+
package com.mulberry.ody.presentation.feature.creation
22

33
sealed interface MeetingCreationNavigateAction {
44
data object NavigateToMeetings : MeetingCreationNavigateAction

‎android/app/src/main/java/com/mulberry/ody/presentation/creation/MeetingCreationViewModel.kt ‎android/app/src/main/java/com/mulberry/ody/presentation/feature/creation/MeetingCreationViewModel.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.presentation.creation
1+
package com.mulberry.ody.presentation.feature.creation
22

33
import android.location.Location
44
import androidx.lifecycle.viewModelScope
@@ -15,7 +15,7 @@ import com.mulberry.ody.presentation.common.BaseViewModel
1515
import com.mulberry.ody.presentation.common.analytics.AnalyticsHelper
1616
import com.mulberry.ody.presentation.common.analytics.logNetworkErrorEvent
1717
import com.mulberry.ody.presentation.common.gps.LocationHelper
18-
import com.mulberry.ody.presentation.creation.listener.MeetingCreationListener
18+
import com.mulberry.ody.presentation.feature.creation.listener.MeetingCreationListener
1919
import dagger.hilt.android.lifecycle.HiltViewModel
2020
import kotlinx.coroutines.flow.MutableSharedFlow
2121
import kotlinx.coroutines.flow.MutableStateFlow

‎android/app/src/main/java/com/mulberry/ody/presentation/creation/date/MeetingDateFragment.kt ‎android/app/src/main/java/com/mulberry/ody/presentation/feature/creation/date/MeetingDateFragment.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package com.mulberry.ody.presentation.creation.date
1+
package com.mulberry.ody.presentation.feature.creation.date
22

33
import android.os.Bundle
44
import android.view.View
55
import androidx.fragment.app.activityViewModels
66
import com.mulberry.ody.R
77
import com.mulberry.ody.databinding.FragmentMeetingDateBinding
8-
import com.mulberry.ody.presentation.collectWhenStarted
98
import com.mulberry.ody.presentation.common.binding.BindingFragment
10-
import com.mulberry.ody.presentation.creation.MeetingCreationInfoType
11-
import com.mulberry.ody.presentation.creation.MeetingCreationViewModel
9+
import com.mulberry.ody.presentation.common.collectWhenStarted
10+
import com.mulberry.ody.presentation.feature.creation.MeetingCreationInfoType
11+
import com.mulberry.ody.presentation.feature.creation.MeetingCreationViewModel
1212
import java.time.LocalDate
1313

1414
class MeetingDateFragment :

‎android/app/src/main/java/com/mulberry/ody/presentation/creation/destination/MeetingDestinationFragment.kt ‎android/app/src/main/java/com/mulberry/ody/presentation/feature/creation/destination/MeetingDestinationFragment.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package com.mulberry.ody.presentation.creation.destination
1+
package com.mulberry.ody.presentation.feature.creation.destination
22

33
import android.os.Bundle
44
import android.view.View
55
import androidx.fragment.app.activityViewModels
66
import com.mulberry.ody.R
77
import com.mulberry.ody.databinding.FragmentMeetingDestinationBinding
8-
import com.mulberry.ody.presentation.address.listener.AddressSearchListener
9-
import com.mulberry.ody.presentation.collectWhenStarted
108
import com.mulberry.ody.presentation.common.binding.BindingFragment
11-
import com.mulberry.ody.presentation.creation.MeetingCreationInfoType
12-
import com.mulberry.ody.presentation.creation.MeetingCreationViewModel
9+
import com.mulberry.ody.presentation.common.collectWhenStarted
10+
import com.mulberry.ody.presentation.feature.address.listener.AddressSearchListener
11+
import com.mulberry.ody.presentation.feature.creation.MeetingCreationInfoType
12+
import com.mulberry.ody.presentation.feature.creation.MeetingCreationViewModel
1313

1414
class MeetingDestinationFragment :
1515
BindingFragment<FragmentMeetingDestinationBinding>(

‎android/app/src/main/java/com/mulberry/ody/presentation/creation/listener/MeetingCreationListener.kt ‎android/app/src/main/java/com/mulberry/ody/presentation/feature/creation/listener/MeetingCreationListener.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mulberry.ody.presentation.creation.listener
1+
package com.mulberry.ody.presentation.feature.creation.listener
22

33
interface MeetingCreationListener {
44
fun onClickCreationMeeting()

‎android/app/src/main/java/com/mulberry/ody/presentation/creation/name/MeetingNameFragment.kt ‎android/app/src/main/java/com/mulberry/ody/presentation/feature/creation/name/MeetingNameFragment.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package com.mulberry.ody.presentation.creation.name
1+
package com.mulberry.ody.presentation.feature.creation.name
22

33
import android.os.Bundle
44
import android.view.View
55
import androidx.fragment.app.activityViewModels
66
import com.mulberry.ody.R
77
import com.mulberry.ody.databinding.FragmentMeetingNameBinding
88
import com.mulberry.ody.presentation.common.binding.BindingFragment
9-
import com.mulberry.ody.presentation.creation.MeetingCreationInfoType
10-
import com.mulberry.ody.presentation.creation.MeetingCreationViewModel
9+
import com.mulberry.ody.presentation.feature.creation.MeetingCreationInfoType
10+
import com.mulberry.ody.presentation.feature.creation.MeetingCreationViewModel
1111

1212
class MeetingNameFragment : BindingFragment<FragmentMeetingNameBinding>(R.layout.fragment_meeting_name) {
1313
private val viewModel: MeetingCreationViewModel by activityViewModels<MeetingCreationViewModel>()

0 commit comments

Comments
 (0)