diff --git a/app/src/main/java/com/futo/circles/core/ImagePickerHelper.kt b/app/src/main/java/com/futo/circles/core/ImagePickerHelper.kt
index d3d5f7c4fd39f773f97f564354c53e7e8a708f9f..d1f01f42a942975e0683a55dc9c4842996fb5af0 100644
--- a/app/src/main/java/com/futo/circles/core/ImagePickerHelper.kt
+++ b/app/src/main/java/com/futo/circles/core/ImagePickerHelper.kt
@@ -8,9 +8,6 @@ import androidx.fragment.app.Fragment
import com.futo.circles.R
import com.futo.circles.extensions.getContentUriForFileUri
import com.futo.circles.extensions.showError
-import com.futo.circles.pick_image.PickImageDialog
-import com.futo.circles.pick_image.PickImageDialogListener
-import com.futo.circles.pick_image.PickImageMethod
import com.github.dhaval2404.imagepicker.ImagePicker
class ImagePickerHelper(private val fragment: Fragment) : PickImageDialogListener {
diff --git a/app/src/main/java/com/futo/circles/pick_image/PickImageDialog.kt b/app/src/main/java/com/futo/circles/core/PickImageDialog.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/pick_image/PickImageDialog.kt
rename to app/src/main/java/com/futo/circles/core/PickImageDialog.kt
index f75573848f9c1140f2db8000d7eb45ff882cbcea..aa8d93ffddeb96de24ff96e0c3fd1e6a964acc15 100644
--- a/app/src/main/java/com/futo/circles/pick_image/PickImageDialog.kt
+++ b/app/src/main/java/com/futo/circles/core/PickImageDialog.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.pick_image
+package com.futo.circles.core
import android.content.Context
import android.os.Bundle
diff --git a/app/src/main/java/com/futo/circles/di/DataSourceModule.kt b/app/src/main/java/com/futo/circles/di/DataSourceModule.kt
index 32ee27fffc437cb8041ad30c7055d7ec6d58221a..30cd5a92e5cf916a6907433293663b8edd65fa5d 100644
--- a/app/src/main/java/com/futo/circles/di/DataSourceModule.kt
+++ b/app/src/main/java/com/futo/circles/di/DataSourceModule.kt
@@ -5,25 +5,25 @@ import com.futo.circles.core.matrix.pass_phrase.restore.RestorePassPhraseDataSou
import com.futo.circles.core.matrix.room.CoreSpacesTreeBuilder
import com.futo.circles.core.matrix.room.CreateRoomDataSource
import com.futo.circles.core.matrix.room.RoomRelationsBuilder
-import com.futo.circles.feature.emoji.data_source.EmojiDataSource
-import com.futo.circles.feature.following.data_source.FollowingDataSource
-import com.futo.circles.feature.group_invite.data_source.InviteMembersDataSource
-import com.futo.circles.feature.group_members.change_role.data_source.ChangeAccessLevelDataSource
-import com.futo.circles.feature.group_members.data_source.ManageGroupMembersDataSource
+import com.futo.circles.feature.timeline.post.emoji.data_source.EmojiDataSource
+import com.futo.circles.feature.circles.following.data_source.FollowingDataSource
+import com.futo.circles.feature.room.invite.data_source.InviteMembersDataSource
+import com.futo.circles.feature.room.manage_members.change_role.data_source.ChangeAccessLevelDataSource
+import com.futo.circles.feature.room.manage_members.data_source.ManageMembersDataSource
import com.futo.circles.feature.home.data_source.HomeDataSource
import com.futo.circles.feature.log_in.data_source.LoginDataSource
-import com.futo.circles.feature.report.data_source.ReportDataSource
-import com.futo.circles.feature.select_users.data_source.SelectUsersDataSource
-import com.futo.circles.feature.setup_circles.data_source.SetupCirclesDataSource
-import com.futo.circles.feature.setup_profile.data_source.SetupProfileDataSource
+import com.futo.circles.feature.timeline.post.report.data_source.ReportDataSource
+import com.futo.circles.feature.room.select_users.data_source.SelectUsersDataSource
+import com.futo.circles.feature.sign_up.setup_circles.data_source.SetupCirclesDataSource
+import com.futo.circles.feature.sign_up.setup_profile.data_source.SetupProfileDataSource
import com.futo.circles.feature.sign_up.data_source.SignUpDataSource
-import com.futo.circles.feature.sign_up_type.data_source.SelectSignUpTypeDataSource
-import com.futo.circles.feature.terms.data_source.AcceptTermsDataSource
+import com.futo.circles.feature.sign_up.sign_up_type.data_source.SelectSignUpTypeDataSource
+import com.futo.circles.feature.sign_up.terms.data_source.AcceptTermsDataSource
import com.futo.circles.feature.timeline.data_source.TimelineBuilder
import com.futo.circles.feature.timeline.data_source.TimelineDataSource
-import com.futo.circles.feature.update_room.data_source.UpdateRoomDataSource
-import com.futo.circles.feature.validate_email.data_source.ValidateEmailDataSource
-import com.futo.circles.feature.validate_token.data_source.ValidateTokenDataSource
+import com.futo.circles.feature.room.update_room.data_source.UpdateRoomDataSource
+import com.futo.circles.feature.sign_up.validate_email.data_source.ValidateEmailDataSource
+import com.futo.circles.feature.sign_up.validate_token.data_source.ValidateTokenDataSource
import com.futo.circles.model.CircleRoomTypeArg
import org.koin.dsl.module
@@ -36,7 +36,7 @@ val dataSourceModule = module {
factory { (roomId: String) -> InviteMembersDataSource(roomId, get()) }
factory { (roomId: String?) -> SelectUsersDataSource(roomId) }
factory { (roomId: String, type: CircleRoomTypeArg) ->
- ManageGroupMembersDataSource(roomId, type, get())
+ ManageMembersDataSource(roomId, type, get())
}
factory { CreateRoomDataSource(get(), get()) }
factory { RoomRelationsBuilder() }
diff --git a/app/src/main/java/com/futo/circles/di/UiModule.kt b/app/src/main/java/com/futo/circles/di/UiModule.kt
index 474955488ebb0e096857ab07da5b1fae2c507b37..545aff30ea13719d275ec31224e9ca3d67ee6147 100644
--- a/app/src/main/java/com/futo/circles/di/UiModule.kt
+++ b/app/src/main/java/com/futo/circles/di/UiModule.kt
@@ -1,27 +1,27 @@
package com.futo.circles.di
import com.futo.circles.feature.circles.CirclesViewModel
-import com.futo.circles.feature.create_room.CreateRoomViewModel
-import com.futo.circles.feature.emoji.EmojiViewModel
-import com.futo.circles.feature.following.FollowingViewModel
-import com.futo.circles.feature.group_invite.InviteMembersViewModel
-import com.futo.circles.feature.group_members.ManageGroupMembersViewModel
-import com.futo.circles.feature.group_members.change_role.ChangeAccessLevelViewModel
+import com.futo.circles.feature.room.create_room.CreateRoomViewModel
+import com.futo.circles.feature.timeline.post.emoji.EmojiViewModel
+import com.futo.circles.feature.circles.following.FollowingViewModel
+import com.futo.circles.feature.room.invite.InviteMembersViewModel
+import com.futo.circles.feature.room.manage_members.ManageMembersViewModel
+import com.futo.circles.feature.room.manage_members.change_role.ChangeAccessLevelViewModel
import com.futo.circles.feature.groups.GroupsViewModel
import com.futo.circles.feature.home.HomeViewModel
import com.futo.circles.feature.log_in.LogInViewModel
-import com.futo.circles.feature.post.CreatePostViewModel
-import com.futo.circles.feature.report.ReportViewModel
-import com.futo.circles.feature.select_users.SelectUsersViewModel
-import com.futo.circles.feature.setup_circles.SetupCirclesViewModel
-import com.futo.circles.feature.setup_profile.SetupProfileViewModel
+import com.futo.circles.feature.timeline.post.CreatePostViewModel
+import com.futo.circles.feature.timeline.post.report.ReportViewModel
+import com.futo.circles.feature.room.select_users.SelectUsersViewModel
+import com.futo.circles.feature.sign_up.setup_circles.SetupCirclesViewModel
+import com.futo.circles.feature.sign_up.setup_profile.SetupProfileViewModel
import com.futo.circles.feature.sign_up.SignUpViewModel
-import com.futo.circles.feature.sign_up_type.SelectSignUpTypeViewModel
-import com.futo.circles.feature.terms.AcceptTermsViewModel
+import com.futo.circles.feature.sign_up.sign_up_type.SelectSignUpTypeViewModel
+import com.futo.circles.feature.sign_up.terms.AcceptTermsViewModel
import com.futo.circles.feature.timeline.TimelineViewModel
-import com.futo.circles.feature.update_room.UpdateRoomViewModel
-import com.futo.circles.feature.validate_email.ValidateEmailViewModel
-import com.futo.circles.feature.validate_token.ValidateTokenViewModel
+import com.futo.circles.feature.room.update_room.UpdateRoomViewModel
+import com.futo.circles.feature.sign_up.validate_email.ValidateEmailViewModel
+import com.futo.circles.feature.sign_up.validate_token.ValidateTokenViewModel
import com.futo.circles.model.CircleRoomTypeArg
import org.koin.androidx.viewmodel.dsl.viewModel
import org.koin.core.parameter.parametersOf
@@ -35,7 +35,7 @@ val uiModule = module {
}
viewModel { (roomId: String) -> InviteMembersViewModel(get { parametersOf(roomId) }) }
viewModel { (roomId: String, type: CircleRoomTypeArg) ->
- ManageGroupMembersViewModel(get { parametersOf(roomId, type) })
+ ManageMembersViewModel(get { parametersOf(roomId, type) })
}
viewModel { (roomId: String?) -> SelectUsersViewModel(get { parametersOf(roomId) }) }
viewModel { CreateRoomViewModel(get()) }
diff --git a/app/src/main/java/com/futo/circles/feature/following/FollowingDialogFragment.kt b/app/src/main/java/com/futo/circles/feature/circles/following/FollowingDialogFragment.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/feature/following/FollowingDialogFragment.kt
rename to app/src/main/java/com/futo/circles/feature/circles/following/FollowingDialogFragment.kt
index ef2250ff45654569c836a9cd22c73d2693788831..98dbf36e6c8c36bb34e7f0566af99f9d0c6c5e99 100644
--- a/app/src/main/java/com/futo/circles/feature/following/FollowingDialogFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/circles/following/FollowingDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.following
+package com.futo.circles.feature.circles.following
import android.os.Bundle
import android.view.View
@@ -8,7 +8,7 @@ import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
import com.futo.circles.databinding.FollowingDialogFragmentBinding
import com.futo.circles.extensions.observeData
import com.futo.circles.extensions.observeResponse
-import com.futo.circles.feature.following.list.FollowingAdapter
+import com.futo.circles.feature.circles.following.list.FollowingAdapter
import com.futo.circles.model.FollowingListItem
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf
diff --git a/app/src/main/java/com/futo/circles/feature/following/FollowingViewModel.kt b/app/src/main/java/com/futo/circles/feature/circles/following/FollowingViewModel.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/feature/following/FollowingViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/circles/following/FollowingViewModel.kt
index c4a55f674dd627955e5df865c3a303c6434e24f2..5d9fa12da430babf1b995a8f76f14d3a190a10cc 100644
--- a/app/src/main/java/com/futo/circles/feature/following/FollowingViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/circles/following/FollowingViewModel.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.following
+package com.futo.circles.feature.circles.following
import androidx.lifecycle.ViewModel
import com.futo.circles.core.SingleEventLiveData
import com.futo.circles.extensions.Response
import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.following.data_source.FollowingDataSource
+import com.futo.circles.feature.circles.following.data_source.FollowingDataSource
class FollowingViewModel(
private val dataSource: FollowingDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/following/RemoveFollowingDialog.kt b/app/src/main/java/com/futo/circles/feature/circles/following/RemoveFollowingDialog.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/feature/following/RemoveFollowingDialog.kt
rename to app/src/main/java/com/futo/circles/feature/circles/following/RemoveFollowingDialog.kt
index 4b0aa892be3d625837ca43aab032e3166d83c852..e8abbfd54c3a67af3d218e48057e59c120348e70 100644
--- a/app/src/main/java/com/futo/circles/feature/following/RemoveFollowingDialog.kt
+++ b/app/src/main/java/com/futo/circles/feature/circles/following/RemoveFollowingDialog.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.following
+package com.futo.circles.feature.circles.following
import android.content.Context
import android.os.Bundle
diff --git a/app/src/main/java/com/futo/circles/feature/following/data_source/FollowingDataSource.kt b/app/src/main/java/com/futo/circles/feature/circles/following/data_source/FollowingDataSource.kt
similarity index 95%
rename from app/src/main/java/com/futo/circles/feature/following/data_source/FollowingDataSource.kt
rename to app/src/main/java/com/futo/circles/feature/circles/following/data_source/FollowingDataSource.kt
index da590aded60ca74d0e494e15cbf7956a109b7b42..a7e52a4b51d704402c4fb6eb007465c1c51b1930 100644
--- a/app/src/main/java/com/futo/circles/feature/following/data_source/FollowingDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/circles/following/data_source/FollowingDataSource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.following.data_source
+package com.futo.circles.feature.circles.following.data_source
import android.content.Context
import androidx.lifecycle.map
diff --git a/app/src/main/java/com/futo/circles/feature/following/list/FollowingAdapter.kt b/app/src/main/java/com/futo/circles/feature/circles/following/list/FollowingAdapter.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/feature/following/list/FollowingAdapter.kt
rename to app/src/main/java/com/futo/circles/feature/circles/following/list/FollowingAdapter.kt
index bb25ceefe2ae5a9f6bab3e96361a17c2a76c53e1..ad9946930f8d3328f6b4cedf094dff759d86b2ac 100644
--- a/app/src/main/java/com/futo/circles/feature/following/list/FollowingAdapter.kt
+++ b/app/src/main/java/com/futo/circles/feature/circles/following/list/FollowingAdapter.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.following.list
+package com.futo.circles.feature.circles.following.list
import android.view.ViewGroup
import com.futo.circles.core.list.BaseRvAdapter
diff --git a/app/src/main/java/com/futo/circles/feature/following/list/FollowingViewHolder.kt b/app/src/main/java/com/futo/circles/feature/circles/following/list/FollowingViewHolder.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/feature/following/list/FollowingViewHolder.kt
rename to app/src/main/java/com/futo/circles/feature/circles/following/list/FollowingViewHolder.kt
index aa5448cfa92af73dbc38f5f7c6d07d14265d4f40..219a382b6ba3775862efceadcb59ff5c7b0c08b7 100644
--- a/app/src/main/java/com/futo/circles/feature/following/list/FollowingViewHolder.kt
+++ b/app/src/main/java/com/futo/circles/feature/circles/following/list/FollowingViewHolder.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.following.list
+package com.futo.circles.feature.circles.following.list
import android.text.format.DateUtils
import android.view.ViewGroup
diff --git a/app/src/main/java/com/futo/circles/feature/create_room/CreateRoomDialogFragment.kt b/app/src/main/java/com/futo/circles/feature/room/create_room/CreateRoomDialogFragment.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/feature/create_room/CreateRoomDialogFragment.kt
rename to app/src/main/java/com/futo/circles/feature/room/create_room/CreateRoomDialogFragment.kt
index 0b3bbee67762ed0f12bff3ba3bd51eb6c3aa5f0d..fd831f5381a0b34c729aac5f80d8ae1995beab49 100644
--- a/app/src/main/java/com/futo/circles/feature/create_room/CreateRoomDialogFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/create_room/CreateRoomDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.create_room
+package com.futo.circles.feature.room.create_room
import android.os.Bundle
import android.view.View
@@ -15,7 +15,7 @@ import com.futo.circles.extensions.observeData
import com.futo.circles.extensions.observeResponse
import com.futo.circles.extensions.setIsVisible
import com.futo.circles.extensions.showSuccess
-import com.futo.circles.feature.select_users.SelectUsersFragment
+import com.futo.circles.feature.room.select_users.SelectUsersFragment
import org.koin.androidx.viewmodel.ext.android.viewModel
class CreateRoomDialogFragment :
diff --git a/app/src/main/java/com/futo/circles/feature/create_room/CreateRoomViewModel.kt b/app/src/main/java/com/futo/circles/feature/room/create_room/CreateRoomViewModel.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/feature/create_room/CreateRoomViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/room/create_room/CreateRoomViewModel.kt
index 95b66b9579ac982eadeb70ee5100825dae4a8d96..2a4daff127c94c48002ba6a6032ffecab934ddb9 100644
--- a/app/src/main/java/com/futo/circles/feature/create_room/CreateRoomViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/create_room/CreateRoomViewModel.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.create_room
+package com.futo.circles.feature.room.create_room
import android.net.Uri
import androidx.lifecycle.MutableLiveData
diff --git a/app/src/main/java/com/futo/circles/feature/group_invite/InviteMembersDialogFragment.kt b/app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersDialogFragment.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/feature/group_invite/InviteMembersDialogFragment.kt
rename to app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersDialogFragment.kt
index 437e32023acccac8348cbd9701cd75341bb0d6fb..66d4b72bedb928a0efac950b166b534f08593f3b 100644
--- a/app/src/main/java/com/futo/circles/feature/group_invite/InviteMembersDialogFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.group_invite
+package com.futo.circles.feature.room.invite
import android.os.Bundle
import android.view.View
@@ -11,8 +11,8 @@ import com.futo.circles.databinding.InviteMembersDialogFragmentBinding
import com.futo.circles.extensions.observeData
import com.futo.circles.extensions.observeResponse
import com.futo.circles.extensions.showSuccess
-import com.futo.circles.feature.select_users.SelectUsersFragment
-import com.futo.circles.feature.select_users.SelectUsersListener
+import com.futo.circles.feature.room.select_users.SelectUsersFragment
+import com.futo.circles.feature.room.select_users.SelectUsersListener
import com.futo.circles.model.UserListItem
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf
diff --git a/app/src/main/java/com/futo/circles/feature/group_invite/InviteMembersViewModel.kt b/app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersViewModel.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/feature/group_invite/InviteMembersViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersViewModel.kt
index 4b6a96a50667cba910cb0e432ff879325ca54278..9b7bd3c42245578d5bf9fad69281f7d15d92bbdd 100644
--- a/app/src/main/java/com/futo/circles/feature/group_invite/InviteMembersViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersViewModel.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.group_invite
+package com.futo.circles.feature.room.invite
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import com.futo.circles.core.SingleEventLiveData
import com.futo.circles.extensions.Response
import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.group_invite.data_source.InviteMembersDataSource
+import com.futo.circles.feature.room.invite.data_source.InviteMembersDataSource
import com.futo.circles.model.UserListItem
class InviteMembersViewModel(
diff --git a/app/src/main/java/com/futo/circles/feature/group_invite/data_source/InviteMembersDataSource.kt b/app/src/main/java/com/futo/circles/feature/room/invite/data_source/InviteMembersDataSource.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/feature/group_invite/data_source/InviteMembersDataSource.kt
rename to app/src/main/java/com/futo/circles/feature/room/invite/data_source/InviteMembersDataSource.kt
index e96f15fd383dd1e111702678cbbea397b95ba166..e5f09903c2f24b57cb2458191b6fb56694e9da67 100644
--- a/app/src/main/java/com/futo/circles/feature/group_invite/data_source/InviteMembersDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/invite/data_source/InviteMembersDataSource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.group_invite.data_source
+package com.futo.circles.feature.room.invite.data_source
import android.content.Context
import com.futo.circles.R
diff --git a/app/src/main/java/com/futo/circles/feature/group_members/ManageGroupMembersDialogFragment.kt b/app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersDialogFragment.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/group_members/ManageGroupMembersDialogFragment.kt
rename to app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersDialogFragment.kt
index 68f23212ba817ec9a810656f0b1c1557966de764..8f910af9b341f072201d6f43f21371e5fe514356 100644
--- a/app/src/main/java/com/futo/circles/feature/group_members/ManageGroupMembersDialogFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.group_members
+package com.futo.circles.feature.room.manage_members
import android.os.Bundle
@@ -8,22 +8,22 @@ import androidx.navigation.fragment.navArgs
import androidx.recyclerview.widget.DividerItemDecoration
import com.futo.circles.R
import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.databinding.ManageGroupMembersDialogFragmentBinding
+import com.futo.circles.databinding.ManageMembersDialogFragmentBinding
import com.futo.circles.extensions.*
-import com.futo.circles.feature.group_members.change_role.ChangeAccessLevelListener
-import com.futo.circles.feature.group_members.list.GroupMembersListAdapter
+import com.futo.circles.feature.room.manage_members.change_role.ChangeAccessLevelListener
+import com.futo.circles.feature.room.manage_members.list.GroupMembersListAdapter
import com.futo.circles.view.ManageMembersOptionsListener
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf
import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
-class ManageGroupMembersDialogFragment :
- BaseFullscreenDialogFragment(ManageGroupMembersDialogFragmentBinding::inflate),
+class ManageMembersDialogFragment :
+ BaseFullscreenDialogFragment(ManageMembersDialogFragmentBinding::inflate),
ManageMembersOptionsListener, ChangeAccessLevelListener {
- private val args: ManageGroupMembersDialogFragmentArgs by navArgs()
- private val viewModel by viewModel<ManageGroupMembersViewModel> {
+ private val args: ManageMembersDialogFragmentArgs by navArgs()
+ private val viewModel by viewModel<ManageMembersViewModel> {
parametersOf(args.roomId, args.type)
}
@@ -36,7 +36,7 @@ class ManageGroupMembersDialogFragment :
}
private val binding by lazy {
- getBinding() as ManageGroupMembersDialogFragmentBinding
+ getBinding() as ManageMembersDialogFragmentBinding
}
@@ -78,7 +78,7 @@ class ManageGroupMembersDialogFragment :
override fun onSetAccessLevel(userId: String, powerLevelsContent: PowerLevelsContent) {
findNavController()
.navigate(
- ManageGroupMembersDialogFragmentDirections.toChangeAccessLevelBottomSheet(
+ ManageMembersDialogFragmentDirections.toChangeAccessLevelBottomSheet(
userId = userId,
levelValue = powerLevelsContent.getUserPowerLevel(userId),
myUserLevelValue = powerLevelsContent.getCurrentUserPowerLevel()
diff --git a/app/src/main/java/com/futo/circles/feature/group_members/ManageGroupMembersViewModel.kt b/app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersViewModel.kt
similarity index 84%
rename from app/src/main/java/com/futo/circles/feature/group_members/ManageGroupMembersViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersViewModel.kt
index 8bcacede91f3bb4443e22ad7e0452d9fc725baba..9692c3db879279bb578d3f6fdd9f9ec320e34aa7 100644
--- a/app/src/main/java/com/futo/circles/feature/group_members/ManageGroupMembersViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersViewModel.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.group_members
+package com.futo.circles.feature.room.manage_members
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
@@ -6,10 +6,10 @@ import androidx.lifecycle.asLiveData
import com.futo.circles.core.SingleEventLiveData
import com.futo.circles.extensions.Response
import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.group_members.data_source.ManageGroupMembersDataSource
+import com.futo.circles.feature.room.manage_members.data_source.ManageMembersDataSource
-class ManageGroupMembersViewModel(
- private val dataSource: ManageGroupMembersDataSource
+class ManageMembersViewModel(
+ private val dataSource: ManageMembersDataSource
) : ViewModel() {
val titleLiveData = MutableLiveData(dataSource.getManageMembersTittle())
diff --git a/app/src/main/java/com/futo/circles/feature/group_members/change_role/ChangeAccessLevelBottomSheet.kt b/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelBottomSheet.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/feature/group_members/change_role/ChangeAccessLevelBottomSheet.kt
rename to app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelBottomSheet.kt
index e023c9df0e209a17b40c684d710bf25bd12236fc..369cd6cc67ee9d25338944985ba1b99fbcb1038a 100644
--- a/app/src/main/java/com/futo/circles/feature/group_members/change_role/ChangeAccessLevelBottomSheet.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelBottomSheet.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.group_members.change_role
+package com.futo.circles.feature.room.manage_members.change_role
import android.content.Context
import android.os.Bundle
@@ -10,7 +10,7 @@ import androidx.navigation.fragment.navArgs
import androidx.recyclerview.widget.DividerItemDecoration
import com.futo.circles.databinding.ChangeAccessLevelBottomSheetBinding
import com.futo.circles.extensions.observeData
-import com.futo.circles.feature.group_members.change_role.list.ChangeAccessLevelAdapter
+import com.futo.circles.feature.room.manage_members.change_role.list.ChangeAccessLevelAdapter
import com.futo.circles.model.AccessLevelListItem
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import org.koin.androidx.viewmodel.ext.android.viewModel
diff --git a/app/src/main/java/com/futo/circles/feature/group_members/change_role/ChangeAccessLevelListener.kt b/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelListener.kt
similarity index 60%
rename from app/src/main/java/com/futo/circles/feature/group_members/change_role/ChangeAccessLevelListener.kt
rename to app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelListener.kt
index e25bf1aa681184414dc858f25ba307d6dece80d5..fc1d35bc09af52d3e365a741cfa4a7e67b55d027 100644
--- a/app/src/main/java/com/futo/circles/feature/group_members/change_role/ChangeAccessLevelListener.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelListener.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.group_members.change_role
+package com.futo.circles.feature.room.manage_members.change_role
interface ChangeAccessLevelListener {
fun onChangeAccessLevel(userId: String, levelValue: Int)
diff --git a/app/src/main/java/com/futo/circles/feature/group_members/change_role/ChangeAccessLevelViewModel.kt b/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelViewModel.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/group_members/change_role/ChangeAccessLevelViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelViewModel.kt
index 4d417c9579fe2f33c090c419d16dc4d86bb218ee..bd3e51ca40e7154d7b2f66c6e3d4e30d2e3aa739 100644
--- a/app/src/main/java/com/futo/circles/feature/group_members/change_role/ChangeAccessLevelViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelViewModel.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.group_members.change_role
+package com.futo.circles.feature.room.manage_members.change_role
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
-import com.futo.circles.feature.group_members.change_role.data_source.ChangeAccessLevelDataSource
+import com.futo.circles.feature.room.manage_members.change_role.data_source.ChangeAccessLevelDataSource
class ChangeAccessLevelViewModel(
private val dataSource: ChangeAccessLevelDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/group_members/change_role/data_source/ChangeAccessLevelDataSource.kt b/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/data_source/ChangeAccessLevelDataSource.kt
similarity index 88%
rename from app/src/main/java/com/futo/circles/feature/group_members/change_role/data_source/ChangeAccessLevelDataSource.kt
rename to app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/data_source/ChangeAccessLevelDataSource.kt
index 86861be51fba618c2a1e5845628d4ef27db75bdc..5748a5104acd29f1485aa804ba2ea47a068358d4 100644
--- a/app/src/main/java/com/futo/circles/feature/group_members/change_role/data_source/ChangeAccessLevelDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/data_source/ChangeAccessLevelDataSource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.group_members.change_role.data_source
+package com.futo.circles.feature.room.manage_members.change_role.data_source
import com.futo.circles.model.AccessLevel
import com.futo.circles.model.AccessLevelListItem
diff --git a/app/src/main/java/com/futo/circles/feature/group_members/change_role/list/AccessLevelViewHolder.kt b/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/list/AccessLevelViewHolder.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/feature/group_members/change_role/list/AccessLevelViewHolder.kt
rename to app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/list/AccessLevelViewHolder.kt
index cd775f8ea55f3178586de3d752b2c510af36dfe8..ac3f381e181b4ef5e17ab2ecb8ae0ee7993210ca 100644
--- a/app/src/main/java/com/futo/circles/feature/group_members/change_role/list/AccessLevelViewHolder.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/list/AccessLevelViewHolder.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.group_members.change_role.list
+package com.futo.circles.feature.room.manage_members.change_role.list
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/java/com/futo/circles/feature/group_members/change_role/list/ChangeAccessLevelAdapter.kt b/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/list/ChangeAccessLevelAdapter.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/feature/group_members/change_role/list/ChangeAccessLevelAdapter.kt
rename to app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/list/ChangeAccessLevelAdapter.kt
index 9694c0cc3a1b4b0398036f7e485e1fa791de9c55..afebc0001d85c2a063839cb980f5f082c8d8e59b 100644
--- a/app/src/main/java/com/futo/circles/feature/group_members/change_role/list/ChangeAccessLevelAdapter.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/list/ChangeAccessLevelAdapter.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.group_members.change_role.list
+package com.futo.circles.feature.room.manage_members.change_role.list
import android.view.ViewGroup
import com.futo.circles.core.list.BaseRvAdapter
diff --git a/app/src/main/java/com/futo/circles/feature/group_members/data_source/ManageGroupMembersDataSource.kt b/app/src/main/java/com/futo/circles/feature/room/manage_members/data_source/ManageMembersDataSource.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/feature/group_members/data_source/ManageGroupMembersDataSource.kt
rename to app/src/main/java/com/futo/circles/feature/room/manage_members/data_source/ManageMembersDataSource.kt
index 73fb2a8b5cf094ba13ad5e476ce966476ad061c6..a0b0c65af92333ae86aaee8be55c7aee60bb8192 100644
--- a/app/src/main/java/com/futo/circles/feature/group_members/data_source/ManageGroupMembersDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/manage_members/data_source/ManageMembersDataSource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.group_members.data_source
+package com.futo.circles.feature.room.manage_members.data_source
import android.content.Context
@@ -22,7 +22,7 @@ import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
-class ManageGroupMembersDataSource(
+class ManageMembersDataSource(
private val roomId: String,
private val type: CircleRoomTypeArg,
private val context: Context
diff --git a/app/src/main/java/com/futo/circles/feature/group_members/list/GroupMemberViewHolder.kt b/app/src/main/java/com/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/feature/group_members/list/GroupMemberViewHolder.kt
rename to app/src/main/java/com/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt
index b60e359e3e76cd3f15b385005a6e869d64238c09..962e6f68eaddeb543e50372f81a5b09ee487af94 100644
--- a/app/src/main/java/com/futo/circles/feature/group_members/list/GroupMemberViewHolder.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.group_members.list
+package com.futo.circles.feature.room.manage_members.list
import android.view.View
import android.view.ViewGroup
diff --git a/app/src/main/java/com/futo/circles/feature/group_members/list/GroupMembersListAdapter.kt b/app/src/main/java/com/futo/circles/feature/room/manage_members/list/MembersListAdapter.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/feature/group_members/list/GroupMembersListAdapter.kt
rename to app/src/main/java/com/futo/circles/feature/room/manage_members/list/MembersListAdapter.kt
index 2da5c3c559d6890ee2ab93dfcd5a13dc07334f8e..58a2a324103e6a1a1aae5e5edc3415704855e960 100644
--- a/app/src/main/java/com/futo/circles/feature/group_members/list/GroupMembersListAdapter.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/manage_members/list/MembersListAdapter.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.group_members.list
+package com.futo.circles.feature.room.manage_members.list
import android.view.ViewGroup
import com.futo.circles.core.list.BaseRvAdapter
diff --git a/app/src/main/java/com/futo/circles/feature/select_users/SelectUsersFragment.kt b/app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersFragment.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/feature/select_users/SelectUsersFragment.kt
rename to app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersFragment.kt
index a9cd8f2fc638f62f951623a2fd7211396e114cf4..1d103c56ca73e23ea759471eac052ac7dd2c5787 100644
--- a/app/src/main/java/com/futo/circles/feature/select_users/SelectUsersFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.select_users
+package com.futo.circles.feature.room.select_users
import android.content.Context
import android.os.Bundle
@@ -11,8 +11,8 @@ import com.futo.circles.databinding.SelectUsersFragmentBinding
import com.futo.circles.extensions.getQueryTextChangeStateFlow
import com.futo.circles.extensions.observeData
import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.feature.select_users.list.search.InviteMembersSearchListAdapter
-import com.futo.circles.feature.select_users.list.selected.SelectedUsersListAdapter
+import com.futo.circles.feature.room.select_users.list.search.InviteMembersSearchListAdapter
+import com.futo.circles.feature.room.select_users.list.selected.SelectedUsersListAdapter
import com.futo.circles.model.UserListItem
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf
diff --git a/app/src/main/java/com/futo/circles/feature/select_users/SelectUsersViewModel.kt b/app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersViewModel.kt
similarity index 87%
rename from app/src/main/java/com/futo/circles/feature/select_users/SelectUsersViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersViewModel.kt
index 189f34a9a3a4a383402cddd20c51c71b73d38c89..7bd0bfc21ce48c2928fa9725340bae45f337f592 100644
--- a/app/src/main/java/com/futo/circles/feature/select_users/SelectUsersViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersViewModel.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.select_users
+package com.futo.circles.feature.room.select_users
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.asLiveData
import com.futo.circles.extensions.launchUi
-import com.futo.circles.feature.select_users.data_source.SelectUsersDataSource
+import com.futo.circles.feature.room.select_users.data_source.SelectUsersDataSource
import com.futo.circles.model.InviteMemberListItem
import com.futo.circles.model.UserListItem
import kotlinx.coroutines.flow.*
diff --git a/app/src/main/java/com/futo/circles/feature/select_users/data_source/SelectUsersDataSource.kt b/app/src/main/java/com/futo/circles/feature/room/select_users/data_source/SelectUsersDataSource.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/feature/select_users/data_source/SelectUsersDataSource.kt
rename to app/src/main/java/com/futo/circles/feature/room/select_users/data_source/SelectUsersDataSource.kt
index b3ca2e96c1f9c7ae4777d2e2c0e12c8f8b62797d..9cb583bb00fabe2b4d7c80464ef7df7a94ca73f3 100644
--- a/app/src/main/java/com/futo/circles/feature/select_users/data_source/SelectUsersDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/select_users/data_source/SelectUsersDataSource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.select_users.data_source
+package com.futo.circles.feature.room.select_users.data_source
import androidx.lifecycle.asFlow
import com.futo.circles.mapping.toUserListItem
diff --git a/app/src/main/java/com/futo/circles/feature/select_users/list/search/InviteMemberViewHolder.kt b/app/src/main/java/com/futo/circles/feature/room/select_users/list/search/InviteMemberViewHolder.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/feature/select_users/list/search/InviteMemberViewHolder.kt
rename to app/src/main/java/com/futo/circles/feature/room/select_users/list/search/InviteMemberViewHolder.kt
index e617b79e15064e5e4429c821b189736678253267..7eeebbf41f600eaea1bdc3123af5a944b535bc5a 100644
--- a/app/src/main/java/com/futo/circles/feature/select_users/list/search/InviteMemberViewHolder.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/select_users/list/search/InviteMemberViewHolder.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.select_users.list.search
+package com.futo.circles.feature.room.select_users.list.search
import android.view.View
import android.view.ViewGroup
diff --git a/app/src/main/java/com/futo/circles/feature/select_users/list/search/InviteMembersSearchListAdapter.kt b/app/src/main/java/com/futo/circles/feature/room/select_users/list/search/InviteMembersSearchListAdapter.kt
similarity index 95%
rename from app/src/main/java/com/futo/circles/feature/select_users/list/search/InviteMembersSearchListAdapter.kt
rename to app/src/main/java/com/futo/circles/feature/room/select_users/list/search/InviteMembersSearchListAdapter.kt
index 63931744924088fcd4a71d7f8cecb1e0f04fb467..3f0b2e82899d032ff6cdf849020bd17ee58be882 100644
--- a/app/src/main/java/com/futo/circles/feature/select_users/list/search/InviteMembersSearchListAdapter.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/select_users/list/search/InviteMembersSearchListAdapter.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.select_users.list.search
+package com.futo.circles.feature.room.select_users.list.search
import android.view.ViewGroup
import com.futo.circles.core.list.BaseRvAdapter
diff --git a/app/src/main/java/com/futo/circles/feature/select_users/list/selected/SelectedUserViewHolder.kt b/app/src/main/java/com/futo/circles/feature/room/select_users/list/selected/SelectedUserViewHolder.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/feature/select_users/list/selected/SelectedUserViewHolder.kt
rename to app/src/main/java/com/futo/circles/feature/room/select_users/list/selected/SelectedUserViewHolder.kt
index 10e309b5862e6f09c682c0bd93242d148c313ab4..3b09172ae3cd9e78be410969688daa09af5cd192 100644
--- a/app/src/main/java/com/futo/circles/feature/select_users/list/selected/SelectedUserViewHolder.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/select_users/list/selected/SelectedUserViewHolder.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.select_users.list.selected
+package com.futo.circles.feature.room.select_users.list.selected
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/java/com/futo/circles/feature/select_users/list/selected/SelectedUsersListAdapter.kt b/app/src/main/java/com/futo/circles/feature/room/select_users/list/selected/SelectedUsersListAdapter.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/feature/select_users/list/selected/SelectedUsersListAdapter.kt
rename to app/src/main/java/com/futo/circles/feature/room/select_users/list/selected/SelectedUsersListAdapter.kt
index 163adc4694f79a32ca62248aaeaae193dcd19e5f..d2de9902aebc31e55eb2942f0f0bfb7f5eb6c800 100644
--- a/app/src/main/java/com/futo/circles/feature/select_users/list/selected/SelectedUsersListAdapter.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/select_users/list/selected/SelectedUsersListAdapter.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.select_users.list.selected
+package com.futo.circles.feature.room.select_users.list.selected
import android.view.ViewGroup
import com.futo.circles.core.list.BaseRvAdapter
diff --git a/app/src/main/java/com/futo/circles/feature/update_room/UpdateRoomDialogFragment.kt b/app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomDialogFragment.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/feature/update_room/UpdateRoomDialogFragment.kt
rename to app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomDialogFragment.kt
index 527d5d9effa87616e3c6d3defc368c4e49643488..05ffb3b165a7b2b54439f436efa5fd220fc794ec 100644
--- a/app/src/main/java/com/futo/circles/feature/update_room/UpdateRoomDialogFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.update_room
+package com.futo.circles.feature.room.update_room
import android.os.Bundle
import android.view.View
diff --git a/app/src/main/java/com/futo/circles/feature/update_room/UpdateRoomViewModel.kt b/app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomViewModel.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/feature/update_room/UpdateRoomViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomViewModel.kt
index eeb114ddcccfd9a4129d802482c2a99aea28aa7d..eb98e201eb74a13dcd1cc7a4a60624ff819978d7 100644
--- a/app/src/main/java/com/futo/circles/feature/update_room/UpdateRoomViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomViewModel.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.update_room
+package com.futo.circles.feature.room.update_room
import android.net.Uri
import androidx.lifecycle.MutableLiveData
@@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModel
import com.futo.circles.core.SingleEventLiveData
import com.futo.circles.extensions.Response
import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.update_room.data_source.UpdateRoomDataSource
+import com.futo.circles.feature.room.update_room.data_source.UpdateRoomDataSource
class UpdateRoomViewModel(
private val dataSource: UpdateRoomDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/update_room/data_source/UpdateRoomDataSource.kt b/app/src/main/java/com/futo/circles/feature/room/update_room/data_source/UpdateRoomDataSource.kt
similarity index 93%
rename from app/src/main/java/com/futo/circles/feature/update_room/data_source/UpdateRoomDataSource.kt
rename to app/src/main/java/com/futo/circles/feature/room/update_room/data_source/UpdateRoomDataSource.kt
index e614f31d089f12bf2e4d838348f92e1f660291d1..b00e758969659fb5916d520d31eff70999972d69 100644
--- a/app/src/main/java/com/futo/circles/feature/update_room/data_source/UpdateRoomDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/room/update_room/data_source/UpdateRoomDataSource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.update_room.data_source
+package com.futo.circles.feature.room.update_room.data_source
import android.content.Context
import android.net.Uri
diff --git a/app/src/main/java/com/futo/circles/feature/setup_circles/SetupCirclesFragment.kt b/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesFragment.kt
similarity index 95%
rename from app/src/main/java/com/futo/circles/feature/setup_circles/SetupCirclesFragment.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesFragment.kt
index bb369c55c9f7fdc54ddf1c7e6285cb0fe0d4818f..73215f284c8e1ea7e59f053a0a4ee581fffe966b 100644
--- a/app/src/main/java/com/futo/circles/feature/setup_circles/SetupCirclesFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.setup_circles
+package com.futo.circles.feature.sign_up.setup_circles
import android.os.Bundle
import android.view.View
@@ -13,7 +13,7 @@ import com.futo.circles.databinding.SetupCirclesFragmentBinding
import com.futo.circles.extensions.observeData
import com.futo.circles.extensions.observeResponse
import com.futo.circles.extensions.showSuccess
-import com.futo.circles.feature.setup_circles.list.SetupCirclesAdapter
+import com.futo.circles.feature.sign_up.setup_circles.list.SetupCirclesAdapter
import com.futo.circles.model.SetupCircleListItem
import org.koin.androidx.viewmodel.ext.android.viewModel
diff --git a/app/src/main/java/com/futo/circles/feature/setup_circles/SetupCirclesViewModel.kt b/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesViewModel.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/feature/setup_circles/SetupCirclesViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesViewModel.kt
index 460d38d8219bfb76ba6da9a9d96e11a268ab2c1d..f933bc15d6a2d26174ec45f0fe423de483e5c895 100644
--- a/app/src/main/java/com/futo/circles/feature/setup_circles/SetupCirclesViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesViewModel.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.setup_circles
+package com.futo.circles.feature.sign_up.setup_circles
import android.net.Uri
import androidx.lifecycle.ViewModel
@@ -7,7 +7,7 @@ import com.futo.circles.core.matrix.room.CreateRoomDataSource
import com.futo.circles.extensions.Response
import com.futo.circles.extensions.createResult
import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.setup_circles.data_source.SetupCirclesDataSource
+import com.futo.circles.feature.sign_up.setup_circles.data_source.SetupCirclesDataSource
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
diff --git a/app/src/main/java/com/futo/circles/feature/setup_circles/data_source/SetupCirclesDataSource.kt b/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/data_source/SetupCirclesDataSource.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/feature/setup_circles/data_source/SetupCirclesDataSource.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/data_source/SetupCirclesDataSource.kt
index fad179d1dc0bc6c78354e237c796319f221f3532..97eaed50c082cd33713bd4501d1bee46b6aca43f 100644
--- a/app/src/main/java/com/futo/circles/feature/setup_circles/data_source/SetupCirclesDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/data_source/SetupCirclesDataSource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.setup_circles.data_source
+package com.futo.circles.feature.sign_up.setup_circles.data_source
import android.content.Context
import android.net.Uri
diff --git a/app/src/main/java/com/futo/circles/feature/setup_circles/list/SetupCirclesAdapter.kt b/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesAdapter.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/feature/setup_circles/list/SetupCirclesAdapter.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesAdapter.kt
index 54fe7bf9b2c5ce783755b126f2569f61d5fd52a5..1bf8940586094efd72682da3155dc0e54dbf3568 100644
--- a/app/src/main/java/com/futo/circles/feature/setup_circles/list/SetupCirclesAdapter.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesAdapter.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.setup_circles.list
+package com.futo.circles.feature.sign_up.setup_circles.list
import android.view.ViewGroup
diff --git a/app/src/main/java/com/futo/circles/feature/setup_circles/list/SetupCirclesViewHolder.kt b/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesViewHolder.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/feature/setup_circles/list/SetupCirclesViewHolder.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesViewHolder.kt
index 3cd64822043d7b1767f718358b5d2021fb8e234f..9f19db8c4b664e63da452881300234646954e246 100644
--- a/app/src/main/java/com/futo/circles/feature/setup_circles/list/SetupCirclesViewHolder.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesViewHolder.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.setup_circles.list
+package com.futo.circles.feature.sign_up.setup_circles.list
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/java/com/futo/circles/feature/setup_profile/SetupProfileFragment.kt b/app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileFragment.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/feature/setup_profile/SetupProfileFragment.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileFragment.kt
index e2f3185d0bfce6cc606e3a4d53557bd639c15ba1..58a72f8d120a9c5133801ee110f400d76c90b15b 100644
--- a/app/src/main/java/com/futo/circles/feature/setup_profile/SetupProfileFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.setup_profile
+package com.futo.circles.feature.sign_up.setup_profile
import android.os.Bundle
import android.view.View
diff --git a/app/src/main/java/com/futo/circles/feature/setup_profile/SetupProfileViewModel.kt b/app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileViewModel.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/feature/setup_profile/SetupProfileViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileViewModel.kt
index 4ee5a109c03fed587fc8838bb3a6cb7e5281fb69..9292795d21d0dc10adcc0424d410a4b3e51f9a28 100644
--- a/app/src/main/java/com/futo/circles/feature/setup_profile/SetupProfileViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileViewModel.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.setup_profile
+package com.futo.circles.feature.sign_up.setup_profile
import android.net.Uri
import androidx.lifecycle.MutableLiveData
@@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModel
import com.futo.circles.core.SingleEventLiveData
import com.futo.circles.extensions.Response
import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.setup_profile.data_source.SetupProfileDataSource
+import com.futo.circles.feature.sign_up.setup_profile.data_source.SetupProfileDataSource
class SetupProfileViewModel(
private val dataSource: SetupProfileDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/setup_profile/data_source/SetupProfileDataSource.kt b/app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/data_source/SetupProfileDataSource.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/feature/setup_profile/data_source/SetupProfileDataSource.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/data_source/SetupProfileDataSource.kt
index efb2a3796c8e6566abcfadd43f04e141be903c3e..fede3251059a28f9518ad1e7fa1026b8af12a90f 100644
--- a/app/src/main/java/com/futo/circles/feature/setup_profile/data_source/SetupProfileDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/data_source/SetupProfileDataSource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.setup_profile.data_source
+package com.futo.circles.feature.sign_up.setup_profile.data_source
import android.content.Context
import android.net.Uri
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up_type/SelectSignUpTypeFragment.kt b/app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/feature/sign_up_type/SelectSignUpTypeFragment.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt
index 6f30b593a78d94e816c66863d867251f271e68cc..61cb4aeaf6f7f40930723dec391e96cb3b2f0e09 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up_type/SelectSignUpTypeFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.sign_up_type
+package com.futo.circles.feature.sign_up.sign_up_type
import android.os.Bundle
import android.view.View
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up_type/SelectSignUpTypeViewModel.kt b/app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/sign_up_type/SelectSignUpTypeViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt
index c633956aa7342084929f30671fcb3cc5108b8543..d1c08a7e21a4ca9affbd027bd84d9333dc188b55 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up_type/SelectSignUpTypeViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.sign_up_type
+package com.futo.circles.feature.sign_up.sign_up_type
import androidx.lifecycle.ViewModel
import com.futo.circles.core.SingleEventLiveData
import com.futo.circles.extensions.Response
import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.sign_up_type.data_source.SelectSignUpTypeDataSource
+import com.futo.circles.feature.sign_up.sign_up_type.data_source.SelectSignUpTypeDataSource
class SelectSignUpTypeViewModel(
private val dataSource: SelectSignUpTypeDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up_type/data_source/SelectSignUpTypeDataSource.kt b/app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/data_source/SelectSignUpTypeDataSource.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/feature/sign_up_type/data_source/SelectSignUpTypeDataSource.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/data_source/SelectSignUpTypeDataSource.kt
index 6c16fa0351a64d74d0ba56a2b536da096bf6c1ab..451aa18fce62e1fc11a9e30f1972121d1563c89f 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up_type/data_source/SelectSignUpTypeDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/data_source/SelectSignUpTypeDataSource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.sign_up_type.data_source
+package com.futo.circles.feature.sign_up.sign_up_type.data_source
import android.content.Context
import com.futo.circles.R
diff --git a/app/src/main/java/com/futo/circles/feature/terms/AcceptTermsFragment.kt b/app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsFragment.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/feature/terms/AcceptTermsFragment.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsFragment.kt
index 8b8d2d68a008b5456ab4c0a53d29192f0fba4328..7bf3a395c9ba5b11586e802b3cafa01294edb03f 100644
--- a/app/src/main/java/com/futo/circles/feature/terms/AcceptTermsFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.terms
+package com.futo.circles.feature.sign_up.terms
import android.os.Bundle
import android.view.View
@@ -12,7 +12,7 @@ import com.futo.circles.databinding.AcceptTermsFragmentBinding
import com.futo.circles.extensions.observeData
import com.futo.circles.extensions.observeResponse
import com.futo.circles.extensions.openCustomTabUrl
-import com.futo.circles.feature.terms.list.TermsListAdapter
+import com.futo.circles.feature.sign_up.terms.list.TermsListAdapter
import com.futo.circles.model.TermsListItem
import org.koin.androidx.viewmodel.ext.android.viewModel
diff --git a/app/src/main/java/com/futo/circles/feature/terms/AcceptTermsViewModel.kt b/app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsViewModel.kt
similarity index 87%
rename from app/src/main/java/com/futo/circles/feature/terms/AcceptTermsViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsViewModel.kt
index 59d0064c514e9918a46565ef09c826c05594d60a..13393c11a91ebcf77436f2cecb04f2e8c899a4b5 100644
--- a/app/src/main/java/com/futo/circles/feature/terms/AcceptTermsViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsViewModel.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.terms
+package com.futo.circles.feature.sign_up.terms
import androidx.lifecycle.ViewModel
import com.futo.circles.core.SingleEventLiveData
import com.futo.circles.extensions.Response
import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.terms.data_source.AcceptTermsDataSource
+import com.futo.circles.feature.sign_up.terms.data_source.AcceptTermsDataSource
import com.futo.circles.model.TermsListItem
import org.matrix.android.sdk.api.auth.registration.RegistrationResult
diff --git a/app/src/main/java/com/futo/circles/feature/terms/data_source/AcceptTermsDataSource.kt b/app/src/main/java/com/futo/circles/feature/sign_up/terms/data_source/AcceptTermsDataSource.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/feature/terms/data_source/AcceptTermsDataSource.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/terms/data_source/AcceptTermsDataSource.kt
index fc3acea0f63a706c07101138eecadc1c848ba2c3..02bd5c44582156781a6c08ebe49d3af8681598c9 100644
--- a/app/src/main/java/com/futo/circles/feature/terms/data_source/AcceptTermsDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/terms/data_source/AcceptTermsDataSource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.terms.data_source
+package com.futo.circles.feature.sign_up.terms.data_source
import android.content.Context
diff --git a/app/src/main/java/com/futo/circles/feature/terms/list/TermsItemViewHolder.kt b/app/src/main/java/com/futo/circles/feature/sign_up/terms/list/TermsItemViewHolder.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/feature/terms/list/TermsItemViewHolder.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/terms/list/TermsItemViewHolder.kt
index 5a018a3b27d0e178905e8bdb9941260ddb3f4271..b56b08ca38c292ae668680fa894ef42835987843 100644
--- a/app/src/main/java/com/futo/circles/feature/terms/list/TermsItemViewHolder.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/terms/list/TermsItemViewHolder.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.terms.list
+package com.futo.circles.feature.sign_up.terms.list
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/java/com/futo/circles/feature/terms/list/TermsListAdapter.kt b/app/src/main/java/com/futo/circles/feature/sign_up/terms/list/TermsListAdapter.kt
similarity index 93%
rename from app/src/main/java/com/futo/circles/feature/terms/list/TermsListAdapter.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/terms/list/TermsListAdapter.kt
index 29637787dd868300b5e14ba663ae7feef2c66a46..b216f89b8b783254a7a92d0272fd421652e3ee52 100644
--- a/app/src/main/java/com/futo/circles/feature/terms/list/TermsListAdapter.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/terms/list/TermsListAdapter.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.terms.list
+package com.futo.circles.feature.sign_up.terms.list
import android.view.ViewGroup
diff --git a/app/src/main/java/com/futo/circles/feature/validate_email/ValidateEmailFragment.kt b/app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailFragment.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/feature/validate_email/ValidateEmailFragment.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailFragment.kt
index ee5efba8d7749fa2934879cdf14fbeb74b155677..6c575920de2ebea599ef5d55271fae9e318296e8 100644
--- a/app/src/main/java/com/futo/circles/feature/validate_email/ValidateEmailFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.validate_email
+package com.futo.circles.feature.sign_up.validate_email
import android.os.Bundle
import android.view.View
diff --git a/app/src/main/java/com/futo/circles/feature/validate_email/ValidateEmailViewModel.kt b/app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailViewModel.kt
similarity index 86%
rename from app/src/main/java/com/futo/circles/feature/validate_email/ValidateEmailViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailViewModel.kt
index 6f9b7842123bd7ab79be758c50c16e52cfb6a6de..0ed4b10226dea295cbf81a94e88f6627f44991d0 100644
--- a/app/src/main/java/com/futo/circles/feature/validate_email/ValidateEmailViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailViewModel.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.validate_email
+package com.futo.circles.feature.sign_up.validate_email
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import com.futo.circles.core.SingleEventLiveData
import com.futo.circles.extensions.Response
import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.validate_email.data_source.ValidateEmailDataSource
+import com.futo.circles.feature.sign_up.validate_email.data_source.ValidateEmailDataSource
import org.matrix.android.sdk.api.auth.registration.RegistrationResult
import org.matrix.android.sdk.internal.auth.registration.AddThreePidRegistrationResponse
diff --git a/app/src/main/java/com/futo/circles/feature/validate_email/data_source/ValidateEmailDataSource.kt b/app/src/main/java/com/futo/circles/feature/sign_up/validate_email/data_source/ValidateEmailDataSource.kt
similarity index 95%
rename from app/src/main/java/com/futo/circles/feature/validate_email/data_source/ValidateEmailDataSource.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/validate_email/data_source/ValidateEmailDataSource.kt
index 4c6e24996773e92eba7e0d2773ec6f84086c9663..d6efc3e6a3f75835ec38ac7583b306d04ff73fac 100644
--- a/app/src/main/java/com/futo/circles/feature/validate_email/data_source/ValidateEmailDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/validate_email/data_source/ValidateEmailDataSource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.validate_email.data_source
+package com.futo.circles.feature.sign_up.validate_email.data_source
import com.futo.circles.BuildConfig
import com.futo.circles.core.VALIDATION_TOKEN_SUBMIT_URL_PREFIX
diff --git a/app/src/main/java/com/futo/circles/feature/validate_token/ValidateTokenFragment.kt b/app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenFragment.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/feature/validate_token/ValidateTokenFragment.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenFragment.kt
index d90516cf8f0860a35d2517fd051d099231ba9532..1d9d6b79f4dc1865ae60c55b83435d61aec1da20 100644
--- a/app/src/main/java/com/futo/circles/feature/validate_token/ValidateTokenFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.validate_token
+package com.futo.circles.feature.sign_up.validate_token
import android.os.Bundle
import android.view.View
diff --git a/app/src/main/java/com/futo/circles/feature/validate_token/ValidateTokenViewModel.kt b/app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenViewModel.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/feature/validate_token/ValidateTokenViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenViewModel.kt
index 2f8c1d156ec062196cc353bd506b403efd9b4d1f..b0d45a30d96d9f53691fdb64d5bcb471b46337ed 100644
--- a/app/src/main/java/com/futo/circles/feature/validate_token/ValidateTokenViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenViewModel.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.validate_token
+package com.futo.circles.feature.sign_up.validate_token
import androidx.lifecycle.ViewModel
import com.futo.circles.core.SingleEventLiveData
import com.futo.circles.extensions.Response
import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.validate_token.data_source.ValidateTokenDataSource
+import com.futo.circles.feature.sign_up.validate_token.data_source.ValidateTokenDataSource
import org.matrix.android.sdk.api.auth.registration.RegistrationResult
class ValidateTokenViewModel(
diff --git a/app/src/main/java/com/futo/circles/feature/validate_token/data_source/ValidateTokenDataSource.kt b/app/src/main/java/com/futo/circles/feature/sign_up/validate_token/data_source/ValidateTokenDataSource.kt
similarity index 93%
rename from app/src/main/java/com/futo/circles/feature/validate_token/data_source/ValidateTokenDataSource.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/validate_token/data_source/ValidateTokenDataSource.kt
index 7d0010dd029af19c976825491c71c5025ac5eb5d..f015b93399a75a1f4bcb11f806920b69387bccb5 100644
--- a/app/src/main/java/com/futo/circles/feature/validate_token/data_source/ValidateTokenDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/validate_token/data_source/ValidateTokenDataSource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.validate_token.data_source
+package com.futo.circles.feature.sign_up.validate_token.data_source
import com.futo.circles.extensions.Response
import com.futo.circles.extensions.createResult
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/TimelineFragment.kt b/app/src/main/java/com/futo/circles/feature/timeline/TimelineFragment.kt
index f1ca4136689cc876e01b57da30f5da1673c2b749..68c2b658926a884339ed017b6e0b807715e28d11 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/TimelineFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/timeline/TimelineFragment.kt
@@ -16,9 +16,9 @@ import com.futo.circles.R
import com.futo.circles.core.list.BaseRvDecoration
import com.futo.circles.databinding.TimelineFragmentBinding
import com.futo.circles.extensions.*
-import com.futo.circles.feature.emoji.EmojiPickerListener
-import com.futo.circles.feature.post.CreatePostListener
-import com.futo.circles.feature.share.ShareProvider
+import com.futo.circles.feature.timeline.post.emoji.EmojiPickerListener
+import com.futo.circles.feature.timeline.post.CreatePostListener
+import com.futo.circles.feature.timeline.post.share.ShareProvider
import com.futo.circles.feature.timeline.list.PostViewHolder
import com.futo.circles.feature.timeline.list.TimelineAdapter
import com.futo.circles.model.CircleRoomTypeArg
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/TimelineViewModel.kt b/app/src/main/java/com/futo/circles/feature/timeline/TimelineViewModel.kt
index b9c495e04bf068b16b8b5a3fb59e874649379c8a..2f546c18021354ecee6772f70bd318250721d86a 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/TimelineViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/timeline/TimelineViewModel.kt
@@ -6,7 +6,7 @@ import androidx.lifecycle.asLiveData
import com.futo.circles.core.SingleEventLiveData
import com.futo.circles.extensions.Response
import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.share.ShareableContent
+import com.futo.circles.feature.timeline.post.share.ShareableContent
import com.futo.circles.feature.timeline.data_source.TimelineDataSource
import com.futo.circles.model.ImageContent
import com.futo.circles.model.PostContent
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/data_source/TimelineDataSource.kt b/app/src/main/java/com/futo/circles/feature/timeline/data_source/TimelineDataSource.kt
index f2c9d22de6fea879278a8b891ff03b77eb4f35af..121150b4e7174af753c1a54d5191bd4a3bfb6437 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/data_source/TimelineDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/timeline/data_source/TimelineDataSource.kt
@@ -8,8 +8,8 @@ import androidx.lifecycle.map
import com.bumptech.glide.Glide
import com.futo.circles.core.matrix.room.RoomRelationsBuilder
import com.futo.circles.extensions.*
-import com.futo.circles.feature.share.ImageShareable
-import com.futo.circles.feature.share.TextShareable
+import com.futo.circles.feature.timeline.post.share.ImageShareable
+import com.futo.circles.feature.timeline.post.share.TextShareable
import com.futo.circles.mapping.nameOrId
import com.futo.circles.model.*
import com.futo.circles.provider.MatrixSessionProvider
diff --git a/app/src/main/java/com/futo/circles/feature/post/CreatePostBottomSheet.kt b/app/src/main/java/com/futo/circles/feature/timeline/post/CreatePostBottomSheet.kt
similarity index 99%
rename from app/src/main/java/com/futo/circles/feature/post/CreatePostBottomSheet.kt
rename to app/src/main/java/com/futo/circles/feature/timeline/post/CreatePostBottomSheet.kt
index 7f65b668f31e7c193d57b228f0e4587ed49e505c..0c22dbb43b899f5246e3bd272b3caf19749e758c 100644
--- a/app/src/main/java/com/futo/circles/feature/post/CreatePostBottomSheet.kt
+++ b/app/src/main/java/com/futo/circles/feature/timeline/post/CreatePostBottomSheet.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.post
+package com.futo.circles.feature.timeline.post
import android.content.Context
import android.net.Uri
diff --git a/app/src/main/java/com/futo/circles/feature/post/CreatePostViewModel.kt b/app/src/main/java/com/futo/circles/feature/timeline/post/CreatePostViewModel.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/feature/post/CreatePostViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/timeline/post/CreatePostViewModel.kt
index de8c309528ef9b78edb45ae4dcd9fe7fd705ea27..0fcee9b85c60b0853afd9c677285a100749c0f04 100644
--- a/app/src/main/java/com/futo/circles/feature/post/CreatePostViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/timeline/post/CreatePostViewModel.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.post
+package com.futo.circles.feature.timeline.post
import android.net.Uri
import androidx.lifecycle.MutableLiveData
diff --git a/app/src/main/java/com/futo/circles/feature/emoji/EmojiBottomSheet.kt b/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/feature/emoji/EmojiBottomSheet.kt
rename to app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt
index 0812568d5bfb120c4cfe73870ea30354384eb658..2a82e45acabdc424f43037f292ae48127754261c 100644
--- a/app/src/main/java/com/futo/circles/feature/emoji/EmojiBottomSheet.kt
+++ b/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.emoji
+package com.futo.circles.feature.timeline.post.emoji
import android.content.Context
import android.os.Bundle
@@ -9,7 +9,7 @@ import android.view.WindowManager
import androidx.navigation.fragment.navArgs
import com.futo.circles.databinding.EmojiBottomSheetBinding
import com.futo.circles.extensions.observeData
-import com.futo.circles.feature.emoji.list.EmojiAdapter
+import com.futo.circles.feature.timeline.post.emoji.list.EmojiAdapter
import com.futo.circles.model.EmojiCategory
import com.futo.circles.model.EmojiItem
import com.google.android.material.bottomsheet.BottomSheetBehavior
diff --git a/app/src/main/java/com/futo/circles/feature/emoji/EmojiViewModel.kt b/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiViewModel.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/emoji/EmojiViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiViewModel.kt
index 0e72ed4628fbf327388451c351a306f17b802e68..560831b1bda8a13c48a5aa9bc77ac044189d6d4c 100644
--- a/app/src/main/java/com/futo/circles/feature/emoji/EmojiViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiViewModel.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.emoji
+package com.futo.circles.feature.timeline.post.emoji
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
-import com.futo.circles.feature.emoji.data_source.EmojiDataSource
+import com.futo.circles.feature.timeline.post.emoji.data_source.EmojiDataSource
import com.futo.circles.model.EmojiItem
class EmojiViewModel(private val emojiDataSource: EmojiDataSource) : ViewModel() {
diff --git a/app/src/main/java/com/futo/circles/feature/emoji/data_source/EmojiDataSource.kt b/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/data_source/EmojiDataSource.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/feature/emoji/data_source/EmojiDataSource.kt
rename to app/src/main/java/com/futo/circles/feature/timeline/post/emoji/data_source/EmojiDataSource.kt
index dfd521d4cd3ae1e79dfb35f4a12d9dbb5d83db43..8a4fd30c2e31b3543a1e32ec3b0a6eebb8987626 100644
--- a/app/src/main/java/com/futo/circles/feature/emoji/data_source/EmojiDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/data_source/EmojiDataSource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.emoji.data_source
+package com.futo.circles.feature.timeline.post.emoji.data_source
import android.content.Context
import android.graphics.Paint
diff --git a/app/src/main/java/com/futo/circles/feature/emoji/list/EmojiAdapter.kt b/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/list/EmojiAdapter.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/feature/emoji/list/EmojiAdapter.kt
rename to app/src/main/java/com/futo/circles/feature/timeline/post/emoji/list/EmojiAdapter.kt
index 9e095eee73b82da89b57697f06f301808cbe0855..dc0ba6d5c8fe5df3c563c2bea0c30366104639b3 100644
--- a/app/src/main/java/com/futo/circles/feature/emoji/list/EmojiAdapter.kt
+++ b/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/list/EmojiAdapter.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.emoji.list
+package com.futo.circles.feature.timeline.post.emoji.list
import android.view.ViewGroup
import com.futo.circles.core.list.BaseRvAdapter
diff --git a/app/src/main/java/com/futo/circles/feature/emoji/list/EmojiViewHolder.kt b/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/list/EmojiViewHolder.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/feature/emoji/list/EmojiViewHolder.kt
rename to app/src/main/java/com/futo/circles/feature/timeline/post/emoji/list/EmojiViewHolder.kt
index 8bdd2744f7e1a54e96f8bde46150de2be08a846a..42acada3b5e4cc8149913dfa2b5fe74e1a165d40 100644
--- a/app/src/main/java/com/futo/circles/feature/emoji/list/EmojiViewHolder.kt
+++ b/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/list/EmojiViewHolder.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.emoji.list
+package com.futo.circles.feature.timeline.post.emoji.list
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/java/com/futo/circles/feature/report/ReportDialogFragment.kt b/app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportDialogFragment.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/feature/report/ReportDialogFragment.kt
rename to app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportDialogFragment.kt
index 78cea1d7de85bcd9d1b30838a3259c6c23024b20..1c69c56533375c62c270fba29d682748233fad83 100644
--- a/app/src/main/java/com/futo/circles/feature/report/ReportDialogFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.report
+package com.futo.circles.feature.timeline.post.report
import android.os.Bundle
import android.view.View
@@ -11,7 +11,7 @@ import com.futo.circles.databinding.ReportDialogFragmentBinding
import com.futo.circles.extensions.observeData
import com.futo.circles.extensions.observeResponse
import com.futo.circles.extensions.showSuccess
-import com.futo.circles.feature.report.list.ReportCategoryAdapter
+import com.futo.circles.feature.timeline.post.report.list.ReportCategoryAdapter
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf
diff --git a/app/src/main/java/com/futo/circles/feature/report/ReportViewModel.kt b/app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportViewModel.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/report/ReportViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportViewModel.kt
index 5ca8e84cda4ba868cb2d6d0266c998dd2ac4bce8..2ed2c7184e32fae78ab78d027578d2ef26a13c31 100644
--- a/app/src/main/java/com/futo/circles/feature/report/ReportViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportViewModel.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.report
+package com.futo.circles.feature.timeline.post.report
import androidx.lifecycle.ViewModel
import com.futo.circles.core.SingleEventLiveData
import com.futo.circles.extensions.Response
import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.report.data_source.ReportDataSource
+import com.futo.circles.feature.timeline.post.report.data_source.ReportDataSource
class ReportViewModel(
private val reportDataSource: ReportDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/report/data_source/ReportDataSource.kt b/app/src/main/java/com/futo/circles/feature/timeline/post/report/data_source/ReportDataSource.kt
similarity index 95%
rename from app/src/main/java/com/futo/circles/feature/report/data_source/ReportDataSource.kt
rename to app/src/main/java/com/futo/circles/feature/timeline/post/report/data_source/ReportDataSource.kt
index e82cb41de940dd4bce879cee99374392cbfa911c..9aefd0bc01a809113f49a38026a813ddc5bdab5e 100644
--- a/app/src/main/java/com/futo/circles/feature/report/data_source/ReportDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/timeline/post/report/data_source/ReportDataSource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.report.data_source
+package com.futo.circles.feature.timeline.post.report.data_source
import android.content.Context
import androidx.lifecycle.MutableLiveData
diff --git a/app/src/main/java/com/futo/circles/feature/report/list/ReportCategoryAdapter.kt b/app/src/main/java/com/futo/circles/feature/timeline/post/report/list/ReportCategoryAdapter.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/feature/report/list/ReportCategoryAdapter.kt
rename to app/src/main/java/com/futo/circles/feature/timeline/post/report/list/ReportCategoryAdapter.kt
index 7328d2f16f168d589a0da3072398f81ad775484f..8b04acea5f8dc4a756a4812b4bf8dc4f46ea2b04 100644
--- a/app/src/main/java/com/futo/circles/feature/report/list/ReportCategoryAdapter.kt
+++ b/app/src/main/java/com/futo/circles/feature/timeline/post/report/list/ReportCategoryAdapter.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.report.list
+package com.futo.circles.feature.timeline.post.report.list
import android.view.ViewGroup
import com.futo.circles.core.list.BaseRvAdapter
diff --git a/app/src/main/java/com/futo/circles/feature/report/list/ReportCategoryViewHolder.kt b/app/src/main/java/com/futo/circles/feature/timeline/post/report/list/ReportCategoryViewHolder.kt
similarity index 93%
rename from app/src/main/java/com/futo/circles/feature/report/list/ReportCategoryViewHolder.kt
rename to app/src/main/java/com/futo/circles/feature/timeline/post/report/list/ReportCategoryViewHolder.kt
index 5bb6974512ae7f7a6709129150d283569b992af6..e6abebbae8385415035ea0e1406ec90709f578b5 100644
--- a/app/src/main/java/com/futo/circles/feature/report/list/ReportCategoryViewHolder.kt
+++ b/app/src/main/java/com/futo/circles/feature/timeline/post/report/list/ReportCategoryViewHolder.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.report.list
+package com.futo.circles.feature.timeline.post.report.list
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/java/com/futo/circles/feature/share/SharableContent.kt b/app/src/main/java/com/futo/circles/feature/timeline/post/share/SharableContent.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/share/SharableContent.kt
rename to app/src/main/java/com/futo/circles/feature/timeline/post/share/SharableContent.kt
index e8b95a263ab4a7147bc977bfbe200c41019ef7cc..f21683f52c2b7a84b87910d4f4861d21baba07d7 100644
--- a/app/src/main/java/com/futo/circles/feature/share/SharableContent.kt
+++ b/app/src/main/java/com/futo/circles/feature/timeline/post/share/SharableContent.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.share
+package com.futo.circles.feature.timeline.post.share
import android.net.Uri
diff --git a/app/src/main/java/com/futo/circles/feature/share/ShareProvider.kt b/app/src/main/java/com/futo/circles/feature/timeline/post/share/ShareProvider.kt
similarity index 95%
rename from app/src/main/java/com/futo/circles/feature/share/ShareProvider.kt
rename to app/src/main/java/com/futo/circles/feature/timeline/post/share/ShareProvider.kt
index 80935d96c0a7d96baa8d903a6e27f57740b0b0a2..e01cdc3f1d9b435da73502641fee80bdef60d330 100644
--- a/app/src/main/java/com/futo/circles/feature/share/ShareProvider.kt
+++ b/app/src/main/java/com/futo/circles/feature/timeline/post/share/ShareProvider.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.share
+package com.futo.circles.feature.timeline.post.share
import android.content.Context
import android.content.Intent
diff --git a/app/src/main/res/layout/manage_group_members_dialog_fragment.xml b/app/src/main/res/layout/manage_members_dialog_fragment.xml
similarity index 100%
rename from app/src/main/res/layout/manage_group_members_dialog_fragment.xml
rename to app/src/main/res/layout/manage_members_dialog_fragment.xml
diff --git a/app/src/main/res/navigation/circles_nav_graph.xml b/app/src/main/res/navigation/circles_nav_graph.xml
index 19d899748559d5de735c9ff0f9f844c930bc0a23..bbf58ef83e0571c737b7ef1f348b71fc4f39f98a 100644
--- a/app/src/main/res/navigation/circles_nav_graph.xml
+++ b/app/src/main/res/navigation/circles_nav_graph.xml
@@ -45,7 +45,7 @@
<dialog
android:id="@+id/createRoomDialogFragment"
- android:name="com.futo.circles.feature.create_room.CreateRoomDialogFragment"
+ android:name="com.futo.circles.feature.room.create_room.CreateRoomDialogFragment"
android:label="CreateCircleDialogFragment"
tools:layout="@layout/create_room_dialog_fragment">
diff --git a/app/src/main/res/navigation/groups_nav_graph.xml b/app/src/main/res/navigation/groups_nav_graph.xml
index 8d4e7548dcf5a82c6bc2a10afded5e03f8005b17..d27d99ff0b362b690253f3af8e32aed67896b7aa 100644
--- a/app/src/main/res/navigation/groups_nav_graph.xml
+++ b/app/src/main/res/navigation/groups_nav_graph.xml
@@ -46,7 +46,7 @@
<dialog
android:id="@+id/createRoomDialogFragment"
- android:name="com.futo.circles.feature.create_room.CreateRoomDialogFragment"
+ android:name="com.futo.circles.feature.room.create_room.CreateRoomDialogFragment"
tools:layout="@layout/create_room_dialog_fragment">
<argument
diff --git a/app/src/main/res/navigation/nav_graph_start_host.xml b/app/src/main/res/navigation/nav_graph_start_host.xml
index 2e5714e53242cb2322aa72c4db718dd6cb46a5b8..675e4bb827768b35f1e838c2f651143158415483 100644
--- a/app/src/main/res/navigation/nav_graph_start_host.xml
+++ b/app/src/main/res/navigation/nav_graph_start_host.xml
@@ -65,7 +65,7 @@
</fragment>
<fragment
android:id="@+id/setupProfileFragment"
- android:name="com.futo.circles.feature.setup_profile.SetupProfileFragment"
+ android:name="com.futo.circles.feature.sign_up.setup_profile.SetupProfileFragment"
android:label="SetupProfileFragment"
tools:layout="@layout/setup_profile_fragment">
<action
@@ -76,7 +76,7 @@
</fragment>
<fragment
android:id="@+id/setupCirclesFragment"
- android:name="com.futo.circles.feature.setup_circles.SetupCirclesFragment"
+ android:name="com.futo.circles.feature.sign_up.setup_circles.SetupCirclesFragment"
android:label="SetupCirclesFragment"
tools:layout="@layout/setup_circles_fragment">
<action
diff --git a/app/src/main/res/navigation/sign_up_nav_graph.xml b/app/src/main/res/navigation/sign_up_nav_graph.xml
index fe44ac99b2d4a3ae12d876e8083957585b2f61f4..d2641d76c0650b3731bb7e68bf15d835d104ce8d 100644
--- a/app/src/main/res/navigation/sign_up_nav_graph.xml
+++ b/app/src/main/res/navigation/sign_up_nav_graph.xml
@@ -19,25 +19,25 @@
<fragment
android:id="@+id/selectSignUpTypeFragment"
- android:name="com.futo.circles.feature.sign_up_type.SelectSignUpTypeFragment"
+ android:name="com.futo.circles.feature.sign_up.sign_up_type.SelectSignUpTypeFragment"
android:label="SelectSignUpTypeFragment"
tools:layout="@layout/select_sign_up_type_fragment" />
<fragment
android:id="@+id/validateTokenFragment"
- android:name="com.futo.circles.feature.validate_token.ValidateTokenFragment"
+ android:name="com.futo.circles.feature.sign_up.validate_token.ValidateTokenFragment"
android:label="ValidateTokenFragment"
tools:layout="@layout/validate_token_fragment" />
<fragment
android:id="@+id/validateEmailFragment"
- android:name="com.futo.circles.feature.validate_email.ValidateEmailFragment"
+ android:name="com.futo.circles.feature.sign_up.validate_email.ValidateEmailFragment"
android:label="CreateAccountFragment"
tools:layout="@layout/validate_email_fragment" />
<fragment
android:id="@+id/acceptTermsFragment"
- android:name="com.futo.circles.feature.terms.AcceptTermsFragment"
+ android:name="com.futo.circles.feature.sign_up.terms.AcceptTermsFragment"
android:label="AcceptTermsFragment"
tools:layout="@layout/accept_terms_fragment" />
diff --git a/app/src/main/res/navigation/timeline_nav_graph.xml b/app/src/main/res/navigation/timeline_nav_graph.xml
index d1655c8e092f4f23b76a3f65edae6e1a7de93f43..2aead82f4cffa485a102c97778d55eb76aa738a9 100644
--- a/app/src/main/res/navigation/timeline_nav_graph.xml
+++ b/app/src/main/res/navigation/timeline_nav_graph.xml
@@ -126,7 +126,7 @@
<dialog
android:id="@+id/inviteMembersDialogFragment"
- android:name="com.futo.circles.feature.group_invite.InviteMembersDialogFragment"
+ android:name="com.futo.circles.feature.room.invite.InviteMembersDialogFragment"
tools:layout="@layout/invite_members_dialog_fragment">
<argument
@@ -138,8 +138,8 @@
<dialog
android:id="@+id/manageMembersDialogFragment"
- android:name="com.futo.circles.feature.group_members.ManageGroupMembersDialogFragment"
- tools:layout="@layout/manage_group_members_dialog_fragment">
+ android:name="com.futo.circles.feature.room.manage_members.ManageMembersDialogFragment"
+ tools:layout="@layout/manage_members_dialog_fragment">
<argument
android:name="roomId"
@@ -175,7 +175,7 @@
</dialog>
<dialog
android:id="@+id/changeAccessLevelBottomSheet"
- android:name="com.futo.circles.feature.group_members.change_role.ChangeAccessLevelBottomSheet"
+ android:name="com.futo.circles.feature.room.manage_members.change_role.ChangeAccessLevelBottomSheet"
android:label="ChangeAccessLevelBottomSheet"
tools:layout="@layout/change_access_level_bottom_sheet">
@@ -197,7 +197,7 @@
</dialog>
<dialog
android:id="@+id/updateRoomDialogFragment"
- android:name="com.futo.circles.feature.update_room.UpdateRoomDialogFragment"
+ android:name="com.futo.circles.feature.room.update_room.UpdateRoomDialogFragment"
android:label="UpdateRoomDialogFragment"
tools:layout="@layout/update_room_dialog_fragment">
@@ -215,7 +215,7 @@
</dialog>
<dialog
android:id="@+id/createPostBottomSheet"
- android:name="com.futo.circles.feature.post.CreatePostBottomSheet"
+ android:name="com.futo.circles.feature.timeline.post.CreatePostBottomSheet"
android:label="CreatePostBottomSheet"
tools:layout="@layout/create_post_bottom_sheet">
@@ -237,7 +237,7 @@
</dialog>
<dialog
android:id="@+id/reportDialogFragment"
- android:name="com.futo.circles.feature.report.ReportDialogFragment"
+ android:name="com.futo.circles.feature.timeline.post.report.ReportDialogFragment"
android:label="ReportDialogFragment"
tools:layout="@layout/report_dialog_fragment">
@@ -254,7 +254,7 @@
</dialog>
<dialog
android:id="@+id/emojiBottomSheet"
- android:name="com.futo.circles.feature.emoji.EmojiBottomSheet"
+ android:name="com.futo.circles.feature.timeline.post.emoji.EmojiBottomSheet"
android:label="EmojiBottomSheet"
tools:layout="@layout/emoji_bottom_sheet">
@@ -271,7 +271,7 @@
</dialog>
<dialog
android:id="@+id/followingDialogFragment"
- android:name="com.futo.circles.feature.following.FollowingDialogFragment"
+ android:name="com.futo.circles.feature.circles.following.FollowingDialogFragment"
android:label="FollowingDialogFragment"
tools:layout="@layout/following_dialog_fragment">