From d6419c0226fe593c3d7e4b11d80fa6c32ea2d29f Mon Sep 17 00:00:00 2001
From: Taras <tarassmakula@gmail.com>
Date: Thu, 16 Jun 2022 15:57:22 +0300
Subject: [PATCH] Change package name
---
app/proguard-rules.pro | 2 +-
.../futo/circles/ExampleInstrumentedTest.kt | 4 +-
app/src/main/AndroidManifest.xml | 8 +-
.../java/com/futo/circles/MainActivity.kt | 6 --
.../java/{com => org}/futo/circles/App.kt | 6 +-
.../java/org/futo/circles/MainActivity.kt | 6 ++
.../futo/circles/core/Constants.kt | 2 +-
.../futo/circles/core/ErrorParser.kt | 2 +-
.../circles/core/ExpandableItemsDataSource.kt | 2 +-
.../futo/circles/core/ImageUtils.kt | 2 +-
.../futo/circles/core/SingleEventLiveData.kt | 2 +-
.../fragment/BaseFullscreenDialogFragment.kt | 4 +-
.../circles/core/fragment/HasLoadingState.kt | 6 +-
.../fragment/ParentBackPressOwnerFragment.kt | 2 +-
.../core/image_picker/ImagePickerHelper.kt | 8 +-
.../PickGalleryImageDialogFragment.kt | 12 +--
.../core/image_picker/PickImageDialog.kt | 4 +-
.../core/list/BaseRecycleViewDecoration.kt | 2 +-
.../circles/core/list/BaseRecyclerView.kt | 2 +-
.../circles/core/list/ChipItemViewHolder.kt | 4 +-
.../futo/circles/core/list/IdEntity.kt | 2 +-
.../core/list/RoomsDividerDecoration.kt | 2 +-
.../matrix/auth/AuthConfirmationProvider.kt | 4 +-
.../core/matrix/pass_phrase/LoadingDialog.kt | 6 +-
.../create/CreatePassPhraseDataSource.kt | 8 +-
.../restore/RestorePassPhraseDataSource.kt | 8 +-
.../core/matrix/room/CoreSpacesTreeBuilder.kt | 6 +-
.../core/matrix/room/CreateRoomDataSource.kt | 10 +--
.../core/matrix/room/RoomRelationsBuilder.kt | 10 +--
.../futo/circles/core/rooms/RoomsFragment.kt | 24 +++---
.../futo/circles/core/rooms/RoomsViewModel.kt | 12 +--
.../core/rooms/data_source/RoomsDataSource.kt | 8 +-
.../circles/core/rooms/list/RoomViewHolder.kt | 18 ++--
.../core/rooms/list/RoomsListAdapter.kt | 6 +-
.../futo/circles/di/DataSourceModule.kt | 86 +++++++++----------
.../{com => org}/futo/circles/di/Modules.kt | 2 +-
.../{com => org}/futo/circles/di/UiModule.kt | 70 +++++++--------
.../circles/extensions/BitmapExtensions.kt | 2 +-
.../circles/extensions/ContextExtensions.kt | 2 +-
.../extensions/CoroutinesExtensions.kt | 6 +-
.../futo/circles/extensions/FileExtensions.kt | 4 +-
.../circles/extensions/FragmentExtensions.kt | 4 +-
.../extensions/GalleryImageItemExtensions.kt | 6 +-
.../circles/extensions/ImageViewExtensions.kt | 12 +--
.../circles/extensions/LiveDataExtensions.kt | 6 +-
.../extensions/MatrixRoomExtensions.kt | 8 +-
.../extensions/MatrixSessionExtensions.kt | 4 +-
.../extensions/MatrixTermsExtension.kt | 4 +-
.../extensions/MatrixUserRoleExtensions.kt | 6 +-
.../extensions/RecyclerViewExtensions.kt | 2 +-
.../extensions/SearchViewExtensions.kt | 2 +-
.../circles/extensions/StringExtensions.kt | 2 +-
.../extensions/TextInputLayoutExtensions.kt | 2 +-
.../futo/circles/extensions/UriExtensions.kt | 4 +-
.../futo/circles/extensions/ViewExtensions.kt | 2 +-
.../circles/extensions/ViewModelExtensions.kt | 2 +-
.../BottomNavigationFragment.kt | 8 +-
.../feature/circles/CirclesDataSource.kt | 14 +--
.../feature/circles/CirclesFragment.kt | 8 +-
.../feature/circles/CirclesViewModel.kt | 6 +-
.../AcceptCircleInviteDataSource.kt | 14 +--
.../AcceptCircleInviteDialogFragment.kt | 18 ++--
.../AcceptCircleInviteViewModel.kt | 10 +--
.../list/CirclesInviteAdapter.kt | 8 +-
.../list/CirclesInviteViewHolder.kt | 18 ++--
.../list/selected/SelectedCirclesAdapter.kt | 10 +--
.../circles/following/FollowingDataSource.kt | 12 +--
.../following/FollowingDialogFragment.kt | 14 +--
.../circles/following/FollowingViewModel.kt | 8 +-
.../following/RemoveFollowingDialog.kt | 6 +-
.../following/list/FollowingAdapter.kt | 6 +-
.../following/list/FollowingViewHolder.kt | 18 ++--
.../feature/groups/GroupsDataSource.kt | 16 ++--
.../circles/feature/groups/GroupsFragment.kt | 8 +-
.../circles/feature/groups/GroupsViewModel.kt | 8 +-
.../circles/feature/log_in/LogInFragment.kt | 16 ++--
.../circles/feature/log_in/LogInViewModel.kt | 8 +-
.../circles/feature/log_in/LoginDataSource.kt | 18 ++--
.../feature/people/PeopleDataSource.kt | 12 +--
.../circles/feature/people/PeopleFragment.kt | 16 ++--
.../circles/feature/people/PeopleViewModel.kt | 8 +-
.../feature/people/UserOptionsDataSource.kt | 6 +-
.../feature/people/list/PeopleAdapter.kt | 10 +--
.../feature/people/list/PeopleViewHolder.kt | 22 ++---
.../feature/people/user/UserDataSource.kt | 16 ++--
.../feature/people/user/UserFragment.kt | 16 ++--
.../feature/people/user/UserViewModel.kt | 2 +-
.../people/user/list/UsersCircleViewHolder.kt | 10 +--
.../people/user/list/UsersCirclesAdapter.kt | 6 +-
.../feature/photos/PhotosDataSource.kt | 10 +--
.../circles/feature/photos/PhotosFragment.kt | 10 +--
.../circles/feature/photos/PhotosViewModel.kt | 6 +-
.../feature/photos/gallery/GalleryFragment.kt | 20 ++---
.../photos/gallery/GalleryViewModel.kt | 24 +++---
.../gallery/list/GalleryImageViewHolder.kt | 12 +--
.../gallery/list/GalleryImagesAdapter.kt | 6 +-
.../photos/preview/GalleryImageDataSource.kt | 12 +--
.../preview/GalleryImageDialogFragment.kt | 18 ++--
.../photos/preview/GalleryImageViewModel.kt | 10 +--
.../photos/save/SaveToGalleryViewModel.kt | 12 +--
.../photos/save/SaveToGalleyDialogFragment.kt | 20 ++---
.../photos/save/SelectGalleryDataSource.kt | 18 ++--
.../photos/save/list/SelectGalleryAdapter.kt | 6 +-
.../save/list/SelectGalleryViewHolder.kt | 16 ++--
.../feature/room/LeaveRoomDataSource.kt | 14 +--
.../create_room/CreateRoomDialogFragment.kt | 24 +++---
.../room/create_room/CreateRoomViewModel.kt | 20 ++---
.../room/invite/InviteMembersDataSource.kt | 12 +--
.../invite/InviteMembersDialogFragment.kt | 22 ++---
.../room/invite/InviteMembersViewModel.kt | 10 +--
.../manage_members/ManageMembersDataSource.kt | 18 ++--
.../ManageMembersDialogFragment.kt | 16 ++--
.../manage_members/ManageMembersViewModel.kt | 8 +-
.../ChangeAccessLevelBottomSheet.kt | 10 +--
.../ChangeAccessLevelDataSource.kt | 6 +-
.../change_role/ChangeAccessLevelListener.kt | 2 +-
.../change_role/ChangeAccessLevelViewModel.kt | 2 +-
.../change_role/list/AccessLevelViewHolder.kt | 12 +--
.../list/ChangeAccessLevelAdapter.kt | 6 +-
.../manage_members/list/MemberViewHolder.kt | 26 +++---
.../manage_members/list/MembersListAdapter.kt | 14 +--
.../select_users/SelectUsersDataSource.kt | 16 ++--
.../room/select_users/SelectUsersFragment.kt | 18 ++--
.../room/select_users/SelectUsersViewModel.kt | 8 +-
.../list/search/InviteMemberViewHolder.kt | 28 +++---
.../search/InviteMembersSearchListAdapter.kt | 12 +--
.../list/selected/SelectedUsersListAdapter.kt | 8 +-
.../room/update_room/UpdateRoomDataSource.kt | 8 +-
.../update_room/UpdateRoomDialogFragment.kt | 16 ++--
.../room/update_room/UpdateRoomViewModel.kt | 8 +-
.../feature/settings/SettingsDataSource.kt | 10 +--
.../feature/settings/SettingsFragment.kt | 18 ++--
.../feature/settings/SettingsViewModel.kt | 8 +-
.../ActiveSessionsDataSource.kt | 14 +--
.../ActiveSessionsDialogFragment.kt | 12 +--
.../ActiveSessionsViewModel.kt | 2 +-
.../list/ActiveSessionsAdapter.kt | 10 +--
.../list/ActiveSessionsViewHolder.kt | 18 ++--
.../remove_session/RemoveSessionDataSource.kt | 12 +--
.../RemoveSessionDialogFragment.kt | 16 ++--
.../remove_session/RemoveSessionViewModel.kt | 8 +-
.../ChangePasswordDataSource.kt | 6 +-
.../ChangePasswordDialogFragment.kt | 14 +--
.../ChangePasswordViewModel.kt | 12 +--
.../deactivate/DeactivateAccountDataSource.kt | 12 +--
.../DeactivateAccountDialogFragment.kt | 20 ++---
.../deactivate/DeactivateAccountViewModel.kt | 8 +-
.../edit_profile/EditProfileDialogFragment.kt | 16 ++--
.../edit_profile/EditProfileViewModel.kt | 10 +--
.../feature/sign_up/SignUpDataSource.kt | 20 ++---
.../circles/feature/sign_up/SignUpFragment.kt | 18 ++--
.../feature/sign_up/SignUpViewModel.kt | 2 +-
.../setup_circles/SetupCirclesDataSource.kt | 10 +--
.../setup_circles/SetupCirclesFragment.kt | 20 ++---
.../setup_circles/SetupCirclesViewModel.kt | 12 +--
.../setup_circles/list/SetupCirclesAdapter.kt | 6 +-
.../list/SetupCirclesViewHolder.kt | 12 +--
.../setup_profile/SetupProfileDataSource.kt | 10 +--
.../setup_profile/SetupProfileFragment.kt | 18 ++--
.../setup_profile/SetupProfileViewModel.kt | 8 +-
.../SelectSignUpTypeDataSource.kt | 10 +--
.../sign_up_type/SelectSignUpTypeFragment.kt | 12 +--
.../sign_up_type/SelectSignUpTypeViewModel.kt | 8 +-
.../sign_up/terms/AcceptTermsDataSource.kt | 22 ++---
.../sign_up/terms/AcceptTermsFragment.kt | 20 ++---
.../sign_up/terms/AcceptTermsViewModel.kt | 10 +--
.../sign_up/terms/list/TermsItemViewHolder.kt | 10 +--
.../sign_up/terms/list/TermsListAdapter.kt | 6 +-
.../validate_email/ValidateEmailDataSource.kt | 16 ++--
.../validate_email/ValidateEmailFragment.kt | 12 +--
.../validate_email/ValidateEmailViewModel.kt | 8 +-
.../validate_token/ValidateTokenDataSource.kt | 10 +--
.../validate_token/ValidateTokenFragment.kt | 16 ++--
.../validate_token/ValidateTokenViewModel.kt | 8 +-
.../circles/feature/splash/SplashFragment.kt | 6 +-
.../feature/timeline/BaseTimelineViewModel.kt | 4 +-
.../feature/timeline/TimelineFragment.kt | 28 +++---
.../feature/timeline/TimelineViewModel.kt | 24 +++---
.../data_source/SendMessageDataSource.kt | 6 +-
.../timeline/data_source/TimelineBuilder.kt | 12 +--
.../data_source/TimelineDataSource.kt | 10 +--
.../feature/timeline/list/TimelineAdapter.kt | 14 +--
.../timeline/list/TimelineViewHolder.kt | 30 +++----
.../list/UploadImageProgressHelper.kt | 12 +--
.../timeline/post/CreatePostBottomSheet.kt | 10 +--
.../timeline/post/PostOptionsDataSource.kt | 20 ++---
.../timeline/post/emoji/EmojiBottomSheet.kt | 12 +--
.../timeline/post/emoji/EmojiDataSource.kt | 10 +--
.../timeline/post/emoji/EmojiViewModel.kt | 4 +-
.../timeline/post/emoji/list/EmojiAdapter.kt | 6 +-
.../post/emoji/list/EmojiViewHolder.kt | 10 +--
.../timeline/post/report/ReportDataSource.kt | 10 +--
.../post/report/ReportDialogFragment.kt | 18 ++--
.../timeline/post/report/ReportViewModel.kt | 8 +-
.../post/report/list/ReportCategoryAdapter.kt | 6 +-
.../report/list/ReportCategoryViewHolder.kt | 10 +--
.../timeline/post/share/SharableContent.kt | 2 +-
.../timeline/post/share/ShareProvider.kt | 4 +-
.../circles/glide/CirclesAppGlideModule.kt | 4 +-
.../circles/glide/CirclesGlideDataFetcher.kt | 8 +-
.../glide/CirclesGlideModelLoaderFactory.kt | 4 +-
.../futo/circles/glide/LocalFileHelper.kt | 2 +-
.../mapping/FollowingListItemMapping.kt | 8 +-
.../futo/circles/mapping/MatrixUserMapping.kt | 8 +-
.../circles/mapping/RoomListItemMapping.kt | 8 +-
.../mapping/RoomMemberSummaryMapping.kt | 8 +-
.../circles/mapping/TimelineEventMapping.kt | 4 +-
.../futo/circles/model/AccessLevel.kt | 2 +-
.../futo/circles/model/AccessLevelListItem.kt | 4 +-
.../circles/model/ActiveSessionListItem.kt | 6 +-
.../circles/model/CircleListItemPayload.kt | 2 +-
.../futo/circles/model/CircleRoomTypeArg.kt | 2 +-
.../futo/circles/model/CirclesRoom.kt | 4 +-
.../futo/circles/model/CirclesUserSummary.kt | 2 +-
.../futo/circles/model/EmojiCategory.kt | 2 +-
.../futo/circles/model/EmojiData.kt | 2 +-
.../futo/circles/model/EmojiItem.kt | 4 +-
.../futo/circles/model/FollowingListItem.kt | 4 +-
.../circles/model/GalleryImageListItem.kt | 4 +-
.../circles/model/GroupListItemPayload.kt | 2 +-
.../futo/circles/model/GroupMemberListItem.kt | 16 ++--
.../circles/model/InviteMemberListItem.kt | 6 +-
.../futo/circles/model/LoadingData.kt | 4 +-
.../futo/circles/model/PeopleListItem.kt | 6 +-
.../{com => org}/futo/circles/model/Post.kt | 6 +-
.../futo/circles/model/PostContent.kt | 2 +-
.../futo/circles/model/PostInfo.kt | 2 +-
.../futo/circles/model/PostItemPayload.kt | 2 +-
.../futo/circles/model/ReactionsData.kt | 2 +-
.../circles/model/ReportCategoryListItem.kt | 4 +-
.../futo/circles/model/RoomListItem.kt | 4 +-
.../circles/model/SelectableRoomListItem.kt | 4 +-
.../futo/circles/model/SetupCircleListItem.kt | 4 +-
.../futo/circles/model/TermsListItem.kt | 4 +-
.../provider/MatrixInstanceProvider.kt | 2 +-
.../circles/provider/MatrixSessionProvider.kt | 2 +-
.../RoomDisplayNameFallbackProviderImpl.kt | 2 +-
.../circles/view/ActiveSessionInfoView.kt | 12 +--
.../futo/circles/view/CirclesLogoView.kt | 4 +-
.../futo/circles/view/ExpandContentButton.kt | 6 +-
.../futo/circles/view/GroupPostFooterView.kt | 16 ++--
.../futo/circles/view/GroupPostHeaderView.kt | 16 ++--
.../futo/circles/view/LoadingButton.kt | 10 +--
.../futo/circles/view/LoadingView.kt | 8 +-
.../circles/view/ManageMembersOptionsView.kt | 12 +--
.../futo/circles/view/PostLayout.kt | 12 +--
.../futo/circles/view/PreviewPostView.kt | 12 +--
.../futo/circles/view/ProfileView.kt | 8 +-
.../accept_circle_invite_dialog_fragment.xml | 2 +-
.../main/res/layout/accept_terms_fragment.xml | 4 +-
.../res/layout/active_session_list_item.xml | 2 +-
.../change_password_dialog_fragment.xml | 2 +-
.../res/layout/create_post_bottom_sheet.xml | 2 +-
.../layout/create_room_dialog_fragment.xml | 2 +-
.../deactivate_account_dialog_fragment.xml | 2 +-
.../layout/edit_profile_dialog_fragment.xml | 2 +-
app/src/main/res/layout/image_post_view.xml | 6 +-
.../layout/invite_members_dialog_fragment.xml | 2 +-
app/src/main/res/layout/loading_dialog.xml | 2 +-
app/src/main/res/layout/log_in_fragment.xml | 6 +-
app/src/main/res/layout/member_list_item.xml | 2 +-
app/src/main/res/layout/post_layout.xml | 6 +-
app/src/main/res/layout/preview_post_view.xml | 4 +-
.../layout/remove_session_dialog_fragment.xml | 2 +-
.../res/layout/report_dialog_fragment.xml | 2 +-
.../save_to_gallery_dialog_fragment.xml | 2 +-
.../layout/select_sign_up_type_fragment.xml | 4 +-
app/src/main/res/layout/settings_fragment.xml | 2 +-
.../res/layout/setup_circles_fragment.xml | 2 +-
.../res/layout/setup_profile_fragment.xml | 2 +-
app/src/main/res/layout/text_post_view.xml | 4 +-
.../layout/update_room_dialog_fragment.xml | 2 +-
.../res/layout/validate_email_fragment.xml | 6 +-
.../res/layout/validate_token_fragment.xml | 4 +-
.../main/res/navigation/circles_nav_graph.xml | 12 +--
.../main/res/navigation/groups_nav_graph.xml | 10 +--
.../res/navigation/nav_graph_start_host.xml | 12 +--
.../main/res/navigation/people_nav_graph.xml | 4 +-
.../main/res/navigation/photos_nav_graph.xml | 18 ++--
.../res/navigation/settings_nav_graph.xml | 12 +--
.../main/res/navigation/sign_up_nav_graph.xml | 8 +-
.../res/navigation/timeline_nav_graph.xml | 30 +++----
.../futo/circles/ExampleUnitTest.kt | 2 +-
283 files changed, 1321 insertions(+), 1321 deletions(-)
rename app/src/androidTest/java/{com => org}/futo/circles/ExampleInstrumentedTest.kt (86%)
delete mode 100644 app/src/main/java/com/futo/circles/MainActivity.kt
rename app/src/main/java/{com => org}/futo/circles/App.kt (75%)
create mode 100644 app/src/main/java/org/futo/circles/MainActivity.kt
rename app/src/main/java/{com => org}/futo/circles/core/Constants.kt (91%)
rename app/src/main/java/{com => org}/futo/circles/core/ErrorParser.kt (96%)
rename app/src/main/java/{com => org}/futo/circles/core/ExpandableItemsDataSource.kt (95%)
rename app/src/main/java/{com => org}/futo/circles/core/ImageUtils.kt (97%)
rename app/src/main/java/{com => org}/futo/circles/core/SingleEventLiveData.kt (95%)
rename app/src/main/java/{com => org}/futo/circles/core/fragment/BaseFullscreenDialogFragment.kt (94%)
rename app/src/main/java/{com => org}/futo/circles/core/fragment/HasLoadingState.kt (85%)
rename app/src/main/java/{com => org}/futo/circles/core/fragment/ParentBackPressOwnerFragment.kt (95%)
rename app/src/main/java/{com => org}/futo/circles/core/image_picker/ImagePickerHelper.kt (94%)
rename app/src/main/java/{com => org}/futo/circles/core/image_picker/PickGalleryImageDialogFragment.kt (87%)
rename app/src/main/java/{com => org}/futo/circles/core/image_picker/PickImageDialog.kt (92%)
rename app/src/main/java/{com => org}/futo/circles/core/list/BaseRecycleViewDecoration.kt (98%)
rename app/src/main/java/{com => org}/futo/circles/core/list/BaseRecyclerView.kt (98%)
rename app/src/main/java/{com => org}/futo/circles/core/list/ChipItemViewHolder.kt (87%)
rename app/src/main/java/{com => org}/futo/circles/core/list/IdEntity.kt (61%)
rename app/src/main/java/{com => org}/futo/circles/core/list/RoomsDividerDecoration.kt (98%)
rename app/src/main/java/{com => org}/futo/circles/core/matrix/auth/AuthConfirmationProvider.kt (93%)
rename app/src/main/java/{com => org}/futo/circles/core/matrix/pass_phrase/LoadingDialog.kt (85%)
rename app/src/main/java/{com => org}/futo/circles/core/matrix/pass_phrase/create/CreatePassPhraseDataSource.kt (94%)
rename app/src/main/java/{com => org}/futo/circles/core/matrix/pass_phrase/restore/RestorePassPhraseDataSource.kt (94%)
rename app/src/main/java/{com => org}/futo/circles/core/matrix/room/CoreSpacesTreeBuilder.kt (88%)
rename app/src/main/java/{com => org}/futo/circles/core/matrix/room/CreateRoomDataSource.kt (92%)
rename app/src/main/java/{com => org}/futo/circles/core/matrix/room/RoomRelationsBuilder.kt (88%)
rename app/src/main/java/{com => org}/futo/circles/core/rooms/RoomsFragment.kt (75%)
rename app/src/main/java/{com => org}/futo/circles/core/rooms/RoomsViewModel.kt (60%)
rename app/src/main/java/{com => org}/futo/circles/core/rooms/data_source/RoomsDataSource.kt (65%)
rename app/src/main/java/{com => org}/futo/circles/core/rooms/list/RoomViewHolder.kt (94%)
rename app/src/main/java/{com => org}/futo/circles/core/rooms/list/RoomsListAdapter.kt (96%)
rename app/src/main/java/{com => org}/futo/circles/di/DataSourceModule.kt (51%)
rename app/src/main/java/{com => org}/futo/circles/di/Modules.kt (68%)
rename app/src/main/java/{com => org}/futo/circles/di/UiModule.kt (58%)
rename app/src/main/java/{com => org}/futo/circles/extensions/BitmapExtensions.kt (94%)
rename app/src/main/java/{com => org}/futo/circles/extensions/ContextExtensions.kt (81%)
rename app/src/main/java/{com => org}/futo/circles/extensions/CoroutinesExtensions.kt (84%)
rename app/src/main/java/{com => org}/futo/circles/extensions/FileExtensions.kt (73%)
rename app/src/main/java/{com => org}/futo/circles/extensions/FragmentExtensions.kt (98%)
rename app/src/main/java/{com => org}/futo/circles/extensions/GalleryImageItemExtensions.kt (79%)
rename app/src/main/java/{com => org}/futo/circles/extensions/ImageViewExtensions.kt (90%)
rename app/src/main/java/{com => org}/futo/circles/extensions/LiveDataExtensions.kt (90%)
rename app/src/main/java/{com => org}/futo/circles/extensions/MatrixRoomExtensions.kt (79%)
rename app/src/main/java/{com => org}/futo/circles/extensions/MatrixSessionExtensions.kt (91%)
rename app/src/main/java/{com => org}/futo/circles/extensions/MatrixTermsExtension.kt (82%)
rename app/src/main/java/{com => org}/futo/circles/extensions/MatrixUserRoleExtensions.kt (96%)
rename app/src/main/java/{com => org}/futo/circles/extensions/RecyclerViewExtensions.kt (95%)
rename app/src/main/java/{com => org}/futo/circles/extensions/SearchViewExtensions.kt (94%)
rename app/src/main/java/{com => org}/futo/circles/extensions/StringExtensions.kt (79%)
rename app/src/main/java/{com => org}/futo/circles/extensions/TextInputLayoutExtensions.kt (85%)
rename app/src/main/java/{com => org}/futo/circles/extensions/UriExtensions.kt (97%)
rename app/src/main/java/{com => org}/futo/circles/extensions/ViewExtensions.kt (97%)
rename app/src/main/java/{com => org}/futo/circles/extensions/ViewModelExtensions.kt (96%)
rename app/src/main/java/{com => org}/futo/circles/feature/bottom_navigation/BottomNavigationFragment.kt (88%)
rename app/src/main/java/{com => org}/futo/circles/feature/circles/CirclesDataSource.kt (70%)
rename app/src/main/java/{com => org}/futo/circles/feature/circles/CirclesFragment.kt (80%)
rename app/src/main/java/{com => org}/futo/circles/feature/circles/CirclesViewModel.kt (75%)
rename app/src/main/java/{com => org}/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDataSource.kt (79%)
rename app/src/main/java/{com => org}/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDialogFragment.kt (81%)
rename app/src/main/java/{com => org}/futo/circles/feature/circles/accept_invite/AcceptCircleInviteViewModel.kt (69%)
rename app/src/main/java/{com => org}/futo/circles/feature/circles/accept_invite/list/CirclesInviteAdapter.kt (74%)
rename app/src/main/java/{com => org}/futo/circles/feature/circles/accept_invite/list/CirclesInviteViewHolder.kt (70%)
rename app/src/main/java/{com => org}/futo/circles/feature/circles/accept_invite/list/selected/SelectedCirclesAdapter.kt (70%)
rename app/src/main/java/{com => org}/futo/circles/feature/circles/following/FollowingDataSource.kt (80%)
rename app/src/main/java/{com => org}/futo/circles/feature/circles/following/FollowingDialogFragment.kt (82%)
rename app/src/main/java/{com => org}/futo/circles/feature/circles/following/FollowingViewModel.kt (77%)
rename app/src/main/java/{com => org}/futo/circles/feature/circles/following/RemoveFollowingDialog.kt (89%)
rename app/src/main/java/{com => org}/futo/circles/feature/circles/following/list/FollowingAdapter.kt (79%)
rename app/src/main/java/{com => org}/futo/circles/feature/circles/following/list/FollowingViewHolder.kt (70%)
rename app/src/main/java/{com => org}/futo/circles/feature/groups/GroupsDataSource.kt (68%)
rename app/src/main/java/{com => org}/futo/circles/feature/groups/GroupsFragment.kt (78%)
rename app/src/main/java/{com => org}/futo/circles/feature/groups/GroupsViewModel.kt (74%)
rename app/src/main/java/{com => org}/futo/circles/feature/log_in/LogInFragment.kt (85%)
rename app/src/main/java/{com => org}/futo/circles/feature/log_in/LogInViewModel.kt (85%)
rename app/src/main/java/{com => org}/futo/circles/feature/log_in/LoginDataSource.kt (75%)
rename app/src/main/java/{com => org}/futo/circles/feature/people/PeopleDataSource.kt (85%)
rename app/src/main/java/{com => org}/futo/circles/feature/people/PeopleFragment.kt (84%)
rename app/src/main/java/{com => org}/futo/circles/feature/people/PeopleViewModel.kt (78%)
rename app/src/main/java/{com => org}/futo/circles/feature/people/UserOptionsDataSource.kt (71%)
rename app/src/main/java/{com => org}/futo/circles/feature/people/list/PeopleAdapter.kt (84%)
rename app/src/main/java/{com => org}/futo/circles/feature/people/list/PeopleViewHolder.kt (75%)
rename app/src/main/java/{com => org}/futo/circles/feature/people/user/UserDataSource.kt (78%)
rename app/src/main/java/{com => org}/futo/circles/feature/people/user/UserFragment.kt (85%)
rename app/src/main/java/{com => org}/futo/circles/feature/people/user/UserViewModel.kt (83%)
rename app/src/main/java/{com => org}/futo/circles/feature/people/user/list/UsersCircleViewHolder.kt (68%)
rename app/src/main/java/{com => org}/futo/circles/feature/people/user/list/UsersCirclesAdapter.kt (74%)
rename app/src/main/java/{com => org}/futo/circles/feature/photos/PhotosDataSource.kt (66%)
rename app/src/main/java/{com => org}/futo/circles/feature/photos/PhotosFragment.kt (81%)
rename app/src/main/java/{com => org}/futo/circles/feature/photos/PhotosViewModel.kt (74%)
rename app/src/main/java/{com => org}/futo/circles/feature/photos/gallery/GalleryFragment.kt (90%)
rename app/src/main/java/{com => org}/futo/circles/feature/photos/gallery/GalleryViewModel.kt (69%)
rename app/src/main/java/{com => org}/futo/circles/feature/photos/gallery/list/GalleryImageViewHolder.kt (65%)
rename app/src/main/java/{com => org}/futo/circles/feature/photos/gallery/list/GalleryImagesAdapter.kt (83%)
rename app/src/main/java/{com => org}/futo/circles/feature/photos/preview/GalleryImageDataSource.kt (68%)
rename app/src/main/java/{com => org}/futo/circles/feature/photos/preview/GalleryImageDialogFragment.kt (86%)
rename app/src/main/java/{com => org}/futo/circles/feature/photos/preview/GalleryImageViewModel.kt (80%)
rename app/src/main/java/{com => org}/futo/circles/feature/photos/save/SaveToGalleryViewModel.kt (73%)
rename app/src/main/java/{com => org}/futo/circles/feature/photos/save/SaveToGalleyDialogFragment.kt (79%)
rename app/src/main/java/{com => org}/futo/circles/feature/photos/save/SelectGalleryDataSource.kt (78%)
rename app/src/main/java/{com => org}/futo/circles/feature/photos/save/list/SelectGalleryAdapter.kt (80%)
rename app/src/main/java/{com => org}/futo/circles/feature/photos/save/list/SelectGalleryViewHolder.kt (69%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/LeaveRoomDataSource.kt (78%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/create_room/CreateRoomDialogFragment.kt (84%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/create_room/CreateRoomViewModel.kt (79%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/invite/InviteMembersDataSource.kt (75%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/invite/InviteMembersDialogFragment.kt (77%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/invite/InviteMembersViewModel.kt (67%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/manage_members/ManageMembersDataSource.kt (91%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/manage_members/ManageMembersDialogFragment.kt (89%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/manage_members/ManageMembersViewModel.kt (85%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelBottomSheet.kt (90%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelDataSource.kt (76%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelListener.kt (61%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelViewModel.kt (92%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/manage_members/change_role/list/AccessLevelViewHolder.kt (67%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/manage_members/change_role/list/ChangeAccessLevelAdapter.kt (78%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt (82%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/manage_members/list/MembersListAdapter.kt (81%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/select_users/SelectUsersDataSource.kt (89%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/select_users/SelectUsersFragment.kt (83%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/select_users/SelectUsersViewModel.kt (81%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/select_users/list/search/InviteMemberViewHolder.kt (75%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/select_users/list/search/InviteMembersSearchListAdapter.kt (80%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/select_users/list/selected/SelectedUsersListAdapter.kt (74%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/update_room/UpdateRoomDataSource.kt (81%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/update_room/UpdateRoomDialogFragment.kt (91%)
rename app/src/main/java/{com => org}/futo/circles/feature/room/update_room/UpdateRoomViewModel.kt (85%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/SettingsDataSource.kt (78%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/SettingsFragment.kt (85%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/SettingsViewModel.kt (68%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/active_sessions/ActiveSessionsDataSource.kt (88%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/active_sessions/ActiveSessionsDialogFragment.kt (83%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/active_sessions/ActiveSessionsViewModel.kt (88%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/active_sessions/list/ActiveSessionsAdapter.kt (83%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/active_sessions/list/ActiveSessionsViewHolder.kt (80%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDataSource.kt (69%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDialogFragment.kt (80%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionViewModel.kt (68%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/change_password/ChangePasswordDataSource.kt (61%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/change_password/ChangePasswordDialogFragment.kt (86%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/change_password/ChangePasswordViewModel.kt (77%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/deactivate/DeactivateAccountDataSource.kt (65%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/deactivate/DeactivateAccountDialogFragment.kt (75%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/deactivate/DeactivateAccountViewModel.kt (69%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/edit_profile/EditProfileDialogFragment.kt (87%)
rename app/src/main/java/{com => org}/futo/circles/feature/settings/edit_profile/EditProfileViewModel.kt (80%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/SignUpDataSource.kt (87%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/SignUpFragment.kt (87%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/SignUpViewModel.kt (90%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/setup_circles/SetupCirclesDataSource.kt (81%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/setup_circles/SetupCirclesFragment.kt (81%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/setup_circles/SetupCirclesViewModel.kt (78%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesAdapter.kt (79%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesViewHolder.kt (72%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/setup_profile/SetupProfileDataSource.kt (82%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/setup_profile/SetupProfileFragment.kt (83%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/setup_profile/SetupProfileViewModel.kt (79%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt (80%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt (84%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt (72%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/terms/AcceptTermsDataSource.kt (69%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/terms/AcceptTermsFragment.kt (77%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/terms/AcceptTermsViewModel.kt (75%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/terms/list/TermsItemViewHolder.kt (75%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/terms/list/TermsListAdapter.kt (82%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/validate_email/ValidateEmailDataSource.kt (66%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/validate_email/ValidateEmailFragment.kt (88%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/validate_email/ValidateEmailViewModel.kt (80%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/validate_token/ValidateTokenDataSource.kt (76%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/validate_token/ValidateTokenFragment.kt (77%)
rename app/src/main/java/{com => org}/futo/circles/feature/sign_up/validate_token/ValidateTokenViewModel.kt (69%)
rename app/src/main/java/{com => org}/futo/circles/feature/splash/SplashFragment.kt (82%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/BaseTimelineViewModel.kt (81%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/TimelineFragment.kt (93%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/TimelineViewModel.kt (82%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/data_source/SendMessageDataSource.kt (82%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/data_source/TimelineBuilder.kt (94%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/data_source/TimelineDataSource.kt (92%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/list/TimelineAdapter.kt (87%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/list/TimelineViewHolder.kt (79%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/list/UploadImageProgressHelper.kt (87%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/post/CreatePostBottomSheet.kt (93%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/post/PostOptionsDataSource.kt (76%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt (91%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/post/emoji/EmojiDataSource.kt (94%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/post/emoji/EmojiViewModel.kt (84%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/post/emoji/list/EmojiAdapter.kt (78%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/post/emoji/list/EmojiViewHolder.kt (67%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/post/report/ReportDataSource.kt (82%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/post/report/ReportDialogFragment.kt (81%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/post/report/ReportViewModel.kt (72%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/post/report/list/ReportCategoryAdapter.kt (79%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/post/report/list/ReportCategoryViewHolder.kt (69%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/post/share/SharableContent.kt (78%)
rename app/src/main/java/{com => org}/futo/circles/feature/timeline/post/share/ShareProvider.kt (92%)
rename app/src/main/java/{com => org}/futo/circles/glide/CirclesAppGlideModule.kt (90%)
rename app/src/main/java/{com => org}/futo/circles/glide/CirclesGlideDataFetcher.kt (92%)
rename app/src/main/java/{com => org}/futo/circles/glide/CirclesGlideModelLoaderFactory.kt (93%)
rename app/src/main/java/{com => org}/futo/circles/glide/LocalFileHelper.kt (95%)
rename app/src/main/java/{com => org}/futo/circles/mapping/FollowingListItemMapping.kt (70%)
rename app/src/main/java/{com => org}/futo/circles/mapping/MatrixUserMapping.kt (78%)
rename app/src/main/java/{com => org}/futo/circles/mapping/RoomListItemMapping.kt (90%)
rename app/src/main/java/{com => org}/futo/circles/mapping/RoomMemberSummaryMapping.kt (82%)
rename app/src/main/java/{com => org}/futo/circles/mapping/TimelineEventMapping.kt (97%)
rename app/src/main/java/{com => org}/futo/circles/model/AccessLevel.kt (86%)
rename app/src/main/java/{com => org}/futo/circles/model/AccessLevelListItem.kt (75%)
rename app/src/main/java/{com => org}/futo/circles/model/ActiveSessionListItem.kt (83%)
rename app/src/main/java/{com => org}/futo/circles/model/CircleListItemPayload.kt (80%)
rename app/src/main/java/{com => org}/futo/circles/model/CircleRoomTypeArg.kt (63%)
rename app/src/main/java/{com => org}/futo/circles/model/CirclesRoom.kt (98%)
rename app/src/main/java/{com => org}/futo/circles/model/CirclesUserSummary.kt (76%)
rename app/src/main/java/{com => org}/futo/circles/model/EmojiCategory.kt (80%)
rename app/src/main/java/{com => org}/futo/circles/model/EmojiData.kt (82%)
rename app/src/main/java/{com => org}/futo/circles/model/EmojiItem.kt (80%)
rename app/src/main/java/{com => org}/futo/circles/model/FollowingListItem.kt (74%)
rename app/src/main/java/{com => org}/futo/circles/model/GalleryImageListItem.kt (66%)
rename app/src/main/java/{com => org}/futo/circles/model/GroupListItemPayload.kt (85%)
rename app/src/main/java/{com => org}/futo/circles/model/GroupMemberListItem.kt (75%)
rename app/src/main/java/{com => org}/futo/circles/model/InviteMemberListItem.kt (86%)
rename app/src/main/java/{com => org}/futo/circles/model/LoadingData.kt (78%)
rename app/src/main/java/{com => org}/futo/circles/model/PeopleListItem.kt (83%)
rename app/src/main/java/{com => org}/futo/circles/model/Post.kt (85%)
rename app/src/main/java/{com => org}/futo/circles/model/PostContent.kt (96%)
rename app/src/main/java/{com => org}/futo/circles/model/PostInfo.kt (89%)
rename app/src/main/java/{com => org}/futo/circles/model/PostItemPayload.kt (83%)
rename app/src/main/java/{com => org}/futo/circles/model/ReactionsData.kt (75%)
rename app/src/main/java/{com => org}/futo/circles/model/ReportCategoryListItem.kt (65%)
rename app/src/main/java/{com => org}/futo/circles/model/RoomListItem.kt (94%)
rename app/src/main/java/{com => org}/futo/circles/model/SelectableRoomListItem.kt (65%)
rename app/src/main/java/{com => org}/futo/circles/model/SetupCircleListItem.kt (70%)
rename app/src/main/java/{com => org}/futo/circles/model/TermsListItem.kt (66%)
rename app/src/main/java/{com => org}/futo/circles/provider/MatrixInstanceProvider.kt (86%)
rename app/src/main/java/{com => org}/futo/circles/provider/MatrixSessionProvider.kt (97%)
rename app/src/main/java/{com => org}/futo/circles/provider/RoomDisplayNameFallbackProviderImpl.kt (96%)
rename app/src/main/java/{com => org}/futo/circles/view/ActiveSessionInfoView.kt (88%)
rename app/src/main/java/{com => org}/futo/circles/view/CirclesLogoView.kt (98%)
rename app/src/main/java/{com => org}/futo/circles/view/ExpandContentButton.kt (93%)
rename app/src/main/java/{com => org}/futo/circles/view/GroupPostFooterView.kt (91%)
rename app/src/main/java/{com => org}/futo/circles/view/GroupPostHeaderView.kt (91%)
rename app/src/main/java/{com => org}/futo/circles/view/LoadingButton.kt (89%)
rename app/src/main/java/{com => org}/futo/circles/view/LoadingView.kt (81%)
rename app/src/main/java/{com => org}/futo/circles/view/ManageMembersOptionsView.kt (85%)
rename app/src/main/java/{com => org}/futo/circles/view/PostLayout.kt (93%)
rename app/src/main/java/{com => org}/futo/circles/view/PreviewPostView.kt (90%)
rename app/src/main/java/{com => org}/futo/circles/view/ProfileView.kt (78%)
rename app/src/test/java/{com => org}/futo/circles/ExampleUnitTest.kt (92%)
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 8c2a65485..165665d7f 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -75,4 +75,4 @@ native <methods>;
-keep class org.matrix.android.sdk.internal.auth.DefaultAuthenticationService
-keep class org.matrix.android.sdk.internal.auth.db.PendingSessionData
--keep class com.futo.circles.model.CircleRoomTypeArg
\ No newline at end of file
+-keep class org.futo.circles.model.CircleRoomTypeArg
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/futo/circles/ExampleInstrumentedTest.kt b/app/src/androidTest/java/org/futo/circles/ExampleInstrumentedTest.kt
similarity index 86%
rename from app/src/androidTest/java/com/futo/circles/ExampleInstrumentedTest.kt
rename to app/src/androidTest/java/org/futo/circles/ExampleInstrumentedTest.kt
index 1b1ae64ca..2da370acd 100644
--- a/app/src/androidTest/java/com/futo/circles/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/org/futo/circles/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.futo.circles
+package org.futo.circles
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
- assertEquals("com.futo.circles", appContext.packageName)
+ assertEquals("org.futo.circles", appContext.packageName)
}
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 866da8975..f6d9e5bb2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="com.futo.circles">
+ package="org.futo.circles">
<application
- android:name=".App"
+ android:name="org.futo.circles.App"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
@@ -13,7 +13,7 @@
android:theme="@style/Theme.Circles"
tools:ignore="DataExtractionRules">
<activity
- android:name=".MainActivity"
+ android:name="org.futo.circles.MainActivity"
android:exported="true"
android:screenOrientation="portrait"
tools:ignore="LockedOrientationActivity">
@@ -38,7 +38,7 @@
<provider
android:name="androidx.core.content.FileProvider"
- android:authorities="com.futo.circles.provider"
+ android:authorities="org.futo.circles.provider"
android:exported="false"
android:grantUriPermissions="true" >
<meta-data
diff --git a/app/src/main/java/com/futo/circles/MainActivity.kt b/app/src/main/java/com/futo/circles/MainActivity.kt
deleted file mode 100644
index 386877454..000000000
--- a/app/src/main/java/com/futo/circles/MainActivity.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.futo.circles
-
-import androidx.appcompat.app.AppCompatActivity
-
-
-class MainActivity : AppCompatActivity(R.layout.main_activity)
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/circles/App.kt b/app/src/main/java/org/futo/circles/App.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/App.kt
rename to app/src/main/java/org/futo/circles/App.kt
index 730870f18..6f628b8db 100644
--- a/app/src/main/java/com/futo/circles/App.kt
+++ b/app/src/main/java/org/futo/circles/App.kt
@@ -1,8 +1,8 @@
-package com.futo.circles
+package org.futo.circles
import android.app.Application
-import com.futo.circles.di.applicationModules
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.di.applicationModules
+import org.futo.circles.provider.MatrixSessionProvider
import org.koin.android.ext.koin.androidContext
import org.koin.core.context.startKoin
diff --git a/app/src/main/java/org/futo/circles/MainActivity.kt b/app/src/main/java/org/futo/circles/MainActivity.kt
new file mode 100644
index 000000000..abd056a88
--- /dev/null
+++ b/app/src/main/java/org/futo/circles/MainActivity.kt
@@ -0,0 +1,6 @@
+package org.futo.circles
+
+import androidx.appcompat.app.AppCompatActivity
+
+
+class MainActivity : AppCompatActivity(org.futo.circles.R.layout.main_activity)
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/circles/core/Constants.kt b/app/src/main/java/org/futo/circles/core/Constants.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/core/Constants.kt
rename to app/src/main/java/org/futo/circles/core/Constants.kt
index 1167153d7..4d89b60a4 100644
--- a/app/src/main/java/com/futo/circles/core/Constants.kt
+++ b/app/src/main/java/org/futo/circles/core/Constants.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core
+package org.futo.circles.core
const val FILE_PROVIDER_AUTHORITY_PREFIX = ".provider"
diff --git a/app/src/main/java/com/futo/circles/core/ErrorParser.kt b/app/src/main/java/org/futo/circles/core/ErrorParser.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/core/ErrorParser.kt
rename to app/src/main/java/org/futo/circles/core/ErrorParser.kt
index b017e563e..ecb4f7816 100644
--- a/app/src/main/java/com/futo/circles/core/ErrorParser.kt
+++ b/app/src/main/java/org/futo/circles/core/ErrorParser.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core
+package org.futo.circles.core
import org.json.JSONObject
import org.matrix.android.sdk.api.failure.Failure
diff --git a/app/src/main/java/com/futo/circles/core/ExpandableItemsDataSource.kt b/app/src/main/java/org/futo/circles/core/ExpandableItemsDataSource.kt
similarity index 95%
rename from app/src/main/java/com/futo/circles/core/ExpandableItemsDataSource.kt
rename to app/src/main/java/org/futo/circles/core/ExpandableItemsDataSource.kt
index d2582a6f3..1b7df4ae5 100644
--- a/app/src/main/java/com/futo/circles/core/ExpandableItemsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/core/ExpandableItemsDataSource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core
+package org.futo.circles.core
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.update
diff --git a/app/src/main/java/com/futo/circles/core/ImageUtils.kt b/app/src/main/java/org/futo/circles/core/ImageUtils.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/core/ImageUtils.kt
rename to app/src/main/java/org/futo/circles/core/ImageUtils.kt
index 00d8e7552..c8c22c1f9 100644
--- a/app/src/main/java/com/futo/circles/core/ImageUtils.kt
+++ b/app/src/main/java/org/futo/circles/core/ImageUtils.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core
+package org.futo.circles.core
import android.content.Context
import android.graphics.Bitmap
diff --git a/app/src/main/java/com/futo/circles/core/SingleEventLiveData.kt b/app/src/main/java/org/futo/circles/core/SingleEventLiveData.kt
similarity index 95%
rename from app/src/main/java/com/futo/circles/core/SingleEventLiveData.kt
rename to app/src/main/java/org/futo/circles/core/SingleEventLiveData.kt
index 876a30340..784d1ae76 100644
--- a/app/src/main/java/com/futo/circles/core/SingleEventLiveData.kt
+++ b/app/src/main/java/org/futo/circles/core/SingleEventLiveData.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core
+package org.futo.circles.core
import androidx.annotation.MainThread
import androidx.lifecycle.LifecycleOwner
diff --git a/app/src/main/java/com/futo/circles/core/fragment/BaseFullscreenDialogFragment.kt b/app/src/main/java/org/futo/circles/core/fragment/BaseFullscreenDialogFragment.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/core/fragment/BaseFullscreenDialogFragment.kt
rename to app/src/main/java/org/futo/circles/core/fragment/BaseFullscreenDialogFragment.kt
index 7868e235f..9d9fb3e37 100644
--- a/app/src/main/java/com/futo/circles/core/fragment/BaseFullscreenDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/core/fragment/BaseFullscreenDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core.fragment
+package org.futo.circles.core.fragment
import android.os.Bundle
@@ -8,7 +8,7 @@ import android.view.ViewGroup
import android.view.WindowManager
import androidx.appcompat.app.AppCompatDialogFragment
import androidx.viewbinding.ViewBinding
-import com.futo.circles.R
+import org.futo.circles.R
abstract class BaseFullscreenDialogFragment(
diff --git a/app/src/main/java/com/futo/circles/core/fragment/HasLoadingState.kt b/app/src/main/java/org/futo/circles/core/fragment/HasLoadingState.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/core/fragment/HasLoadingState.kt
rename to app/src/main/java/org/futo/circles/core/fragment/HasLoadingState.kt
index eb670085b..4bdd3710c 100644
--- a/app/src/main/java/com/futo/circles/core/fragment/HasLoadingState.kt
+++ b/app/src/main/java/org/futo/circles/core/fragment/HasLoadingState.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.core.fragment
+package org.futo.circles.core.fragment
import android.view.View
import androidx.fragment.app.Fragment
-import com.futo.circles.extensions.setEnabledViews
-import com.futo.circles.view.LoadingButton
+import org.futo.circles.extensions.setEnabledViews
+import org.futo.circles.view.LoadingButton
interface HasLoadingState {
diff --git a/app/src/main/java/com/futo/circles/core/fragment/ParentBackPressOwnerFragment.kt b/app/src/main/java/org/futo/circles/core/fragment/ParentBackPressOwnerFragment.kt
similarity index 95%
rename from app/src/main/java/com/futo/circles/core/fragment/ParentBackPressOwnerFragment.kt
rename to app/src/main/java/org/futo/circles/core/fragment/ParentBackPressOwnerFragment.kt
index af6323f4c..e2cad2cc8 100644
--- a/app/src/main/java/com/futo/circles/core/fragment/ParentBackPressOwnerFragment.kt
+++ b/app/src/main/java/org/futo/circles/core/fragment/ParentBackPressOwnerFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core.fragment
+package org.futo.circles.core.fragment
import android.content.Context
import androidx.activity.OnBackPressedCallback
diff --git a/app/src/main/java/com/futo/circles/core/image_picker/ImagePickerHelper.kt b/app/src/main/java/org/futo/circles/core/image_picker/ImagePickerHelper.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/core/image_picker/ImagePickerHelper.kt
rename to app/src/main/java/org/futo/circles/core/image_picker/ImagePickerHelper.kt
index 3907ab01f..e84220019 100644
--- a/app/src/main/java/com/futo/circles/core/image_picker/ImagePickerHelper.kt
+++ b/app/src/main/java/org/futo/circles/core/image_picker/ImagePickerHelper.kt
@@ -1,13 +1,13 @@
-package com.futo.circles.core.image_picker
+package org.futo.circles.core.image_picker
import android.app.Activity
import android.net.Uri
import androidx.activity.result.ActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.fragment.app.Fragment
-import com.futo.circles.R
-import com.futo.circles.extensions.getContentUriForFileUri
-import com.futo.circles.extensions.showError
+import org.futo.circles.R
+import org.futo.circles.extensions.getContentUriForFileUri
+import org.futo.circles.extensions.showError
import com.github.dhaval2404.imagepicker.ImagePicker
class ImagePickerHelper(private val fragment: Fragment) : PickImageDialogListener {
diff --git a/app/src/main/java/com/futo/circles/core/image_picker/PickGalleryImageDialogFragment.kt b/app/src/main/java/org/futo/circles/core/image_picker/PickGalleryImageDialogFragment.kt
similarity index 87%
rename from app/src/main/java/com/futo/circles/core/image_picker/PickGalleryImageDialogFragment.kt
rename to app/src/main/java/org/futo/circles/core/image_picker/PickGalleryImageDialogFragment.kt
index 35670a667..cfbcd7765 100644
--- a/app/src/main/java/com/futo/circles/core/image_picker/PickGalleryImageDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/core/image_picker/PickGalleryImageDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core.image_picker
+package org.futo.circles.core.image_picker
import android.app.Dialog
import android.net.Uri
@@ -6,11 +6,11 @@ import android.os.Bundle
import android.view.View
import androidx.core.os.bundleOf
import androidx.fragment.app.setFragmentResult
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.databinding.PickGalleryImageDialogFragmentBinding
-import com.futo.circles.feature.photos.PhotosFragment
-import com.futo.circles.feature.photos.gallery.GalleryFragment
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.databinding.PickGalleryImageDialogFragmentBinding
+import org.futo.circles.feature.photos.PhotosFragment
+import org.futo.circles.feature.photos.gallery.GalleryFragment
interface PickGalleryListener {
fun onGalleryChosen(id: String)
diff --git a/app/src/main/java/com/futo/circles/core/image_picker/PickImageDialog.kt b/app/src/main/java/org/futo/circles/core/image_picker/PickImageDialog.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/core/image_picker/PickImageDialog.kt
rename to app/src/main/java/org/futo/circles/core/image_picker/PickImageDialog.kt
index 3fd3c2955..c3c3983f0 100644
--- a/app/src/main/java/com/futo/circles/core/image_picker/PickImageDialog.kt
+++ b/app/src/main/java/org/futo/circles/core/image_picker/PickImageDialog.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.core.image_picker
+package org.futo.circles.core.image_picker
import android.content.Context
import android.os.Bundle
import android.view.LayoutInflater
import androidx.appcompat.app.AppCompatDialog
-import com.futo.circles.databinding.PickImageDialogBinding
+import org.futo.circles.databinding.PickImageDialogBinding
enum class PickImageMethod { Camera, Gallery, Device }
diff --git a/app/src/main/java/com/futo/circles/core/list/BaseRecycleViewDecoration.kt b/app/src/main/java/org/futo/circles/core/list/BaseRecycleViewDecoration.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/core/list/BaseRecycleViewDecoration.kt
rename to app/src/main/java/org/futo/circles/core/list/BaseRecycleViewDecoration.kt
index db67dde0d..002723a5c 100644
--- a/app/src/main/java/com/futo/circles/core/list/BaseRecycleViewDecoration.kt
+++ b/app/src/main/java/org/futo/circles/core/list/BaseRecycleViewDecoration.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core.list
+package org.futo.circles.core.list
import android.graphics.Canvas
import android.graphics.Rect
diff --git a/app/src/main/java/com/futo/circles/core/list/BaseRecyclerView.kt b/app/src/main/java/org/futo/circles/core/list/BaseRecyclerView.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/core/list/BaseRecyclerView.kt
rename to app/src/main/java/org/futo/circles/core/list/BaseRecyclerView.kt
index b7a7e8218..dbc8c603f 100644
--- a/app/src/main/java/com/futo/circles/core/list/BaseRecyclerView.kt
+++ b/app/src/main/java/org/futo/circles/core/list/BaseRecyclerView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core.list
+package org.futo.circles.core.list
import android.annotation.SuppressLint
import android.content.Context
diff --git a/app/src/main/java/com/futo/circles/core/list/ChipItemViewHolder.kt b/app/src/main/java/org/futo/circles/core/list/ChipItemViewHolder.kt
similarity index 87%
rename from app/src/main/java/com/futo/circles/core/list/ChipItemViewHolder.kt
rename to app/src/main/java/org/futo/circles/core/list/ChipItemViewHolder.kt
index d18b83b6a..30f1f4d54 100644
--- a/app/src/main/java/com/futo/circles/core/list/ChipItemViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/core/list/ChipItemViewHolder.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.core.list
+package org.futo.circles.core.list
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.databinding.ChipListItemBinding
+import org.futo.circles.databinding.ChipListItemBinding
class ChipItemViewHolder(
parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/core/list/IdEntity.kt b/app/src/main/java/org/futo/circles/core/list/IdEntity.kt
similarity index 61%
rename from app/src/main/java/com/futo/circles/core/list/IdEntity.kt
rename to app/src/main/java/org/futo/circles/core/list/IdEntity.kt
index b4b428a56..10b2548cc 100644
--- a/app/src/main/java/com/futo/circles/core/list/IdEntity.kt
+++ b/app/src/main/java/org/futo/circles/core/list/IdEntity.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core.list
+package org.futo.circles.core.list
interface IdEntity<out IdClass> {
val id: IdClass
diff --git a/app/src/main/java/com/futo/circles/core/list/RoomsDividerDecoration.kt b/app/src/main/java/org/futo/circles/core/list/RoomsDividerDecoration.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/core/list/RoomsDividerDecoration.kt
rename to app/src/main/java/org/futo/circles/core/list/RoomsDividerDecoration.kt
index 9f420a2eb..581e80957 100644
--- a/app/src/main/java/com/futo/circles/core/list/RoomsDividerDecoration.kt
+++ b/app/src/main/java/org/futo/circles/core/list/RoomsDividerDecoration.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core.list
+package org.futo.circles.core.list
import android.content.Context
import android.graphics.Canvas
diff --git a/app/src/main/java/com/futo/circles/core/matrix/auth/AuthConfirmationProvider.kt b/app/src/main/java/org/futo/circles/core/matrix/auth/AuthConfirmationProvider.kt
similarity index 93%
rename from app/src/main/java/com/futo/circles/core/matrix/auth/AuthConfirmationProvider.kt
rename to app/src/main/java/org/futo/circles/core/matrix/auth/AuthConfirmationProvider.kt
index 4da054049..598076af9 100644
--- a/app/src/main/java/com/futo/circles/core/matrix/auth/AuthConfirmationProvider.kt
+++ b/app/src/main/java/org/futo/circles/core/matrix/auth/AuthConfirmationProvider.kt
@@ -1,6 +1,6 @@
-package com.futo.circles.core.matrix.auth
+package org.futo.circles.core.matrix.auth
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.auth.UIABaseAuth
import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
import org.matrix.android.sdk.api.auth.UserPasswordAuth
diff --git a/app/src/main/java/com/futo/circles/core/matrix/pass_phrase/LoadingDialog.kt b/app/src/main/java/org/futo/circles/core/matrix/pass_phrase/LoadingDialog.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/core/matrix/pass_phrase/LoadingDialog.kt
rename to app/src/main/java/org/futo/circles/core/matrix/pass_phrase/LoadingDialog.kt
index d278448e2..21340bf6f 100644
--- a/app/src/main/java/com/futo/circles/core/matrix/pass_phrase/LoadingDialog.kt
+++ b/app/src/main/java/org/futo/circles/core/matrix/pass_phrase/LoadingDialog.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.core.matrix.pass_phrase
+package org.futo.circles.core.matrix.pass_phrase
import android.content.Context
import android.os.Bundle
import android.view.LayoutInflater
import androidx.appcompat.app.AppCompatDialog
-import com.futo.circles.databinding.LoadingDialogBinding
-import com.futo.circles.model.LoadingData
+import org.futo.circles.databinding.LoadingDialogBinding
+import org.futo.circles.model.LoadingData
class LoadingDialog(context: Context) : AppCompatDialog(context) {
diff --git a/app/src/main/java/com/futo/circles/core/matrix/pass_phrase/create/CreatePassPhraseDataSource.kt b/app/src/main/java/org/futo/circles/core/matrix/pass_phrase/create/CreatePassPhraseDataSource.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/core/matrix/pass_phrase/create/CreatePassPhraseDataSource.kt
rename to app/src/main/java/org/futo/circles/core/matrix/pass_phrase/create/CreatePassPhraseDataSource.kt
index 17d8a4aea..904f002d4 100644
--- a/app/src/main/java/com/futo/circles/core/matrix/pass_phrase/create/CreatePassPhraseDataSource.kt
+++ b/app/src/main/java/org/futo/circles/core/matrix/pass_phrase/create/CreatePassPhraseDataSource.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.core.matrix.pass_phrase.create
+package org.futo.circles.core.matrix.pass_phrase.create
import android.content.Context
import androidx.lifecycle.MutableLiveData
-import com.futo.circles.R
-import com.futo.circles.model.LoadingData
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.model.LoadingData
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.listeners.ProgressListener
import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupLastVersionResult
import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysVersion
diff --git a/app/src/main/java/com/futo/circles/core/matrix/pass_phrase/restore/RestorePassPhraseDataSource.kt b/app/src/main/java/org/futo/circles/core/matrix/pass_phrase/restore/RestorePassPhraseDataSource.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/core/matrix/pass_phrase/restore/RestorePassPhraseDataSource.kt
rename to app/src/main/java/org/futo/circles/core/matrix/pass_phrase/restore/RestorePassPhraseDataSource.kt
index 13619c37c..343754af0 100644
--- a/app/src/main/java/com/futo/circles/core/matrix/pass_phrase/restore/RestorePassPhraseDataSource.kt
+++ b/app/src/main/java/org/futo/circles/core/matrix/pass_phrase/restore/RestorePassPhraseDataSource.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.core.matrix.pass_phrase.restore
+package org.futo.circles.core.matrix.pass_phrase.restore
import android.content.Context
import androidx.lifecycle.MutableLiveData
-import com.futo.circles.R
-import com.futo.circles.model.LoadingData
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.model.LoadingData
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.listeners.StepProgressListener
import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupLastVersionResult
import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupService
diff --git a/app/src/main/java/com/futo/circles/core/matrix/room/CoreSpacesTreeBuilder.kt b/app/src/main/java/org/futo/circles/core/matrix/room/CoreSpacesTreeBuilder.kt
similarity index 88%
rename from app/src/main/java/com/futo/circles/core/matrix/room/CoreSpacesTreeBuilder.kt
rename to app/src/main/java/org/futo/circles/core/matrix/room/CoreSpacesTreeBuilder.kt
index 60fe5169d..31cfdfc94 100644
--- a/app/src/main/java/com/futo/circles/core/matrix/room/CoreSpacesTreeBuilder.kt
+++ b/app/src/main/java/org/futo/circles/core/matrix/room/CoreSpacesTreeBuilder.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.core.matrix.room
+package org.futo.circles.core.matrix.room
import android.content.Context
-import com.futo.circles.R
-import com.futo.circles.model.*
+import org.futo.circles.R
+import org.futo.circles.model.*
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.coroutineScope
diff --git a/app/src/main/java/com/futo/circles/core/matrix/room/CreateRoomDataSource.kt b/app/src/main/java/org/futo/circles/core/matrix/room/CreateRoomDataSource.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/core/matrix/room/CreateRoomDataSource.kt
rename to app/src/main/java/org/futo/circles/core/matrix/room/CreateRoomDataSource.kt
index 1aaff6530..b4c9de2aa 100644
--- a/app/src/main/java/com/futo/circles/core/matrix/room/CreateRoomDataSource.kt
+++ b/app/src/main/java/org/futo/circles/core/matrix/room/CreateRoomDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.core.matrix.room
+package org.futo.circles.core.matrix.room
import android.content.Context
import android.net.Uri
-import com.futo.circles.model.Circle
-import com.futo.circles.model.CirclesRoom
-import com.futo.circles.model.Timeline
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.model.Circle
+import org.futo.circles.model.CirclesRoom
+import org.futo.circles.model.Timeline
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.getRoom
import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
diff --git a/app/src/main/java/com/futo/circles/core/matrix/room/RoomRelationsBuilder.kt b/app/src/main/java/org/futo/circles/core/matrix/room/RoomRelationsBuilder.kt
similarity index 88%
rename from app/src/main/java/com/futo/circles/core/matrix/room/RoomRelationsBuilder.kt
rename to app/src/main/java/org/futo/circles/core/matrix/room/RoomRelationsBuilder.kt
index 62f473380..b82e9e5ef 100644
--- a/app/src/main/java/com/futo/circles/core/matrix/room/RoomRelationsBuilder.kt
+++ b/app/src/main/java/org/futo/circles/core/matrix/room/RoomRelationsBuilder.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.core.matrix.room
+package org.futo.circles.core.matrix.room
-import com.futo.circles.BuildConfig
-import com.futo.circles.model.Group
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.BuildConfig
+import org.futo.circles.model.Group
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.getRoom
import org.matrix.android.sdk.api.session.room.Room
import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
@@ -54,7 +54,7 @@ class RoomRelationsBuilder {
return roomWithTagId?.let { session?.getRoom(it) }
}
- private fun getHomeServerDomain() = BuildConfig.MATRIX_HOME_SERVER_URL
+ private fun getHomeServerDomain() = org.futo.circles.BuildConfig.MATRIX_HOME_SERVER_URL
.substringAfter("//").replace("/", "")
}
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/circles/core/rooms/RoomsFragment.kt b/app/src/main/java/org/futo/circles/core/rooms/RoomsFragment.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/core/rooms/RoomsFragment.kt
rename to app/src/main/java/org/futo/circles/core/rooms/RoomsFragment.kt
index 28d8501e9..f417880d3 100644
--- a/app/src/main/java/com/futo/circles/core/rooms/RoomsFragment.kt
+++ b/app/src/main/java/org/futo/circles/core/rooms/RoomsFragment.kt
@@ -1,21 +1,21 @@
-package com.futo.circles.core.rooms
+package org.futo.circles.core.rooms
import android.os.Bundle
import android.view.View
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.DividerItemDecoration
import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.list.BaseRvDecoration
-import com.futo.circles.core.list.RoomsDividerDecoration
-import com.futo.circles.core.rooms.list.GalleryViewHolder
-import com.futo.circles.core.rooms.list.RoomListItemViewType
-import com.futo.circles.core.rooms.list.RoomsListAdapter
-import com.futo.circles.databinding.RoomsFragmentBinding
-import com.futo.circles.extensions.bindToFab
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.model.RoomListItem
+import org.futo.circles.R
+import org.futo.circles.core.list.BaseRvDecoration
+import org.futo.circles.core.list.RoomsDividerDecoration
+import org.futo.circles.core.rooms.list.GalleryViewHolder
+import org.futo.circles.core.rooms.list.RoomListItemViewType
+import org.futo.circles.core.rooms.list.RoomsListAdapter
+import org.futo.circles.databinding.RoomsFragmentBinding
+import org.futo.circles.extensions.bindToFab
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.model.RoomListItem
interface HasInvites {
fun onAcceptInviteClicked(room: RoomListItem)
diff --git a/app/src/main/java/com/futo/circles/core/rooms/RoomsViewModel.kt b/app/src/main/java/org/futo/circles/core/rooms/RoomsViewModel.kt
similarity index 60%
rename from app/src/main/java/com/futo/circles/core/rooms/RoomsViewModel.kt
rename to app/src/main/java/org/futo/circles/core/rooms/RoomsViewModel.kt
index e4869ab49..187a5dc2e 100644
--- a/app/src/main/java/com/futo/circles/core/rooms/RoomsViewModel.kt
+++ b/app/src/main/java/org/futo/circles/core/rooms/RoomsViewModel.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.core.rooms
+package org.futo.circles.core.rooms
import androidx.lifecycle.LiveData
import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.core.rooms.data_source.RoomsDataSource
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
-import com.futo.circles.model.RoomListItem
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.core.rooms.data_source.RoomsDataSource
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.model.RoomListItem
abstract class RoomsViewModel(
diff --git a/app/src/main/java/com/futo/circles/core/rooms/data_source/RoomsDataSource.kt b/app/src/main/java/org/futo/circles/core/rooms/data_source/RoomsDataSource.kt
similarity index 65%
rename from app/src/main/java/com/futo/circles/core/rooms/data_source/RoomsDataSource.kt
rename to app/src/main/java/org/futo/circles/core/rooms/data_source/RoomsDataSource.kt
index 1c2f08a9b..aedcf1793 100644
--- a/app/src/main/java/com/futo/circles/core/rooms/data_source/RoomsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/core/rooms/data_source/RoomsDataSource.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.core.rooms.data_source
+package org.futo.circles.core.rooms.data_source
-import com.futo.circles.extensions.createResult
-import com.futo.circles.model.RoomListItem
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.extensions.createResult
+import org.futo.circles.model.RoomListItem
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.room.model.RoomSummary
abstract class RoomsDataSource {
diff --git a/app/src/main/java/com/futo/circles/core/rooms/list/RoomViewHolder.kt b/app/src/main/java/org/futo/circles/core/rooms/list/RoomViewHolder.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/core/rooms/list/RoomViewHolder.kt
rename to app/src/main/java/org/futo/circles/core/rooms/list/RoomViewHolder.kt
index 0beda9af0..dd06cf132 100644
--- a/app/src/main/java/com/futo/circles/core/rooms/list/RoomViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/core/rooms/list/RoomViewHolder.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.core.rooms.list
+package org.futo.circles.core.rooms.list
import android.text.format.DateUtils
import android.view.View
@@ -6,14 +6,14 @@ import android.view.ViewGroup
import android.widget.ImageView
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.R
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.core.list.context
-import com.futo.circles.databinding.*
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.extensions.onClick
-import com.futo.circles.extensions.setIsEncryptedIcon
-import com.futo.circles.model.*
+import org.futo.circles.R
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.core.list.context
+import org.futo.circles.databinding.*
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.extensions.onClick
+import org.futo.circles.extensions.setIsEncryptedIcon
+import org.futo.circles.model.*
abstract class RoomViewHolder(view: View) : RecyclerView.ViewHolder(view) {
abstract fun bind(data: RoomListItem)
diff --git a/app/src/main/java/com/futo/circles/core/rooms/list/RoomsListAdapter.kt b/app/src/main/java/org/futo/circles/core/rooms/list/RoomsListAdapter.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/core/rooms/list/RoomsListAdapter.kt
rename to app/src/main/java/org/futo/circles/core/rooms/list/RoomsListAdapter.kt
index ea6fdfe1e..96e0e771f 100644
--- a/app/src/main/java/com/futo/circles/core/rooms/list/RoomsListAdapter.kt
+++ b/app/src/main/java/org/futo/circles/core/rooms/list/RoomsListAdapter.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.core.rooms.list
+package org.futo.circles.core.rooms.list
import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.*
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.*
enum class RoomListItemViewType { JoinedGroup, JoinedCircle, InvitedGroup, InvitedCircle, Gallery }
diff --git a/app/src/main/java/com/futo/circles/di/DataSourceModule.kt b/app/src/main/java/org/futo/circles/di/DataSourceModule.kt
similarity index 51%
rename from app/src/main/java/com/futo/circles/di/DataSourceModule.kt
rename to app/src/main/java/org/futo/circles/di/DataSourceModule.kt
index aa4d53883..b8935b108 100644
--- a/app/src/main/java/com/futo/circles/di/DataSourceModule.kt
+++ b/app/src/main/java/org/futo/circles/di/DataSourceModule.kt
@@ -1,47 +1,47 @@
-package com.futo.circles.di
+package org.futo.circles.di
-import com.futo.circles.core.matrix.auth.AuthConfirmationProvider
-import com.futo.circles.core.matrix.pass_phrase.create.CreatePassPhraseDataSource
-import com.futo.circles.core.matrix.pass_phrase.restore.RestorePassPhraseDataSource
-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.circles.CirclesDataSource
-import com.futo.circles.feature.circles.accept_invite.AcceptCircleInviteDataSource
-import com.futo.circles.feature.circles.following.FollowingDataSource
-import com.futo.circles.feature.groups.GroupsDataSource
-import com.futo.circles.feature.log_in.LoginDataSource
-import com.futo.circles.feature.people.PeopleDataSource
-import com.futo.circles.feature.people.UserOptionsDataSource
-import com.futo.circles.feature.people.user.UserDataSource
-import com.futo.circles.feature.photos.PhotosDataSource
-import com.futo.circles.feature.photos.preview.GalleryImageDataSource
-import com.futo.circles.feature.photos.save.SelectGalleryDataSource
-import com.futo.circles.feature.room.LeaveRoomDataSource
-import com.futo.circles.feature.room.invite.InviteMembersDataSource
-import com.futo.circles.feature.room.manage_members.ManageMembersDataSource
-import com.futo.circles.feature.room.manage_members.change_role.ChangeAccessLevelDataSource
-import com.futo.circles.feature.room.select_users.SelectUsersDataSource
-import com.futo.circles.feature.room.update_room.UpdateRoomDataSource
-import com.futo.circles.feature.settings.SettingsDataSource
-import com.futo.circles.feature.settings.active_sessions.ActiveSessionsDataSource
-import com.futo.circles.feature.settings.active_sessions.remove_session.RemoveSessionDataSource
-import com.futo.circles.feature.settings.change_password.ChangePasswordDataSource
-import com.futo.circles.feature.settings.deactivate.DeactivateAccountDataSource
-import com.futo.circles.feature.sign_up.SignUpDataSource
-import com.futo.circles.feature.sign_up.setup_circles.SetupCirclesDataSource
-import com.futo.circles.feature.sign_up.setup_profile.SetupProfileDataSource
-import com.futo.circles.feature.sign_up.sign_up_type.SelectSignUpTypeDataSource
-import com.futo.circles.feature.sign_up.terms.AcceptTermsDataSource
-import com.futo.circles.feature.sign_up.validate_email.ValidateEmailDataSource
-import com.futo.circles.feature.sign_up.validate_token.ValidateTokenDataSource
-import com.futo.circles.feature.timeline.data_source.SendMessageDataSource
-import com.futo.circles.feature.timeline.data_source.TimelineBuilder
-import com.futo.circles.feature.timeline.data_source.TimelineDataSource
-import com.futo.circles.feature.timeline.post.PostOptionsDataSource
-import com.futo.circles.feature.timeline.post.emoji.EmojiDataSource
-import com.futo.circles.feature.timeline.post.report.ReportDataSource
-import com.futo.circles.model.CircleRoomTypeArg
+import org.futo.circles.core.matrix.auth.AuthConfirmationProvider
+import org.futo.circles.core.matrix.pass_phrase.create.CreatePassPhraseDataSource
+import org.futo.circles.core.matrix.pass_phrase.restore.RestorePassPhraseDataSource
+import org.futo.circles.core.matrix.room.CoreSpacesTreeBuilder
+import org.futo.circles.core.matrix.room.CreateRoomDataSource
+import org.futo.circles.core.matrix.room.RoomRelationsBuilder
+import org.futo.circles.feature.circles.CirclesDataSource
+import org.futo.circles.feature.circles.accept_invite.AcceptCircleInviteDataSource
+import org.futo.circles.feature.circles.following.FollowingDataSource
+import org.futo.circles.feature.groups.GroupsDataSource
+import org.futo.circles.feature.log_in.LoginDataSource
+import org.futo.circles.feature.people.PeopleDataSource
+import org.futo.circles.feature.people.UserOptionsDataSource
+import org.futo.circles.feature.people.user.UserDataSource
+import org.futo.circles.feature.photos.PhotosDataSource
+import org.futo.circles.feature.photos.preview.GalleryImageDataSource
+import org.futo.circles.feature.photos.save.SelectGalleryDataSource
+import org.futo.circles.feature.room.LeaveRoomDataSource
+import org.futo.circles.feature.room.invite.InviteMembersDataSource
+import org.futo.circles.feature.room.manage_members.ManageMembersDataSource
+import org.futo.circles.feature.room.manage_members.change_role.ChangeAccessLevelDataSource
+import org.futo.circles.feature.room.select_users.SelectUsersDataSource
+import org.futo.circles.feature.room.update_room.UpdateRoomDataSource
+import org.futo.circles.feature.settings.SettingsDataSource
+import org.futo.circles.feature.settings.active_sessions.ActiveSessionsDataSource
+import org.futo.circles.feature.settings.active_sessions.remove_session.RemoveSessionDataSource
+import org.futo.circles.feature.settings.change_password.ChangePasswordDataSource
+import org.futo.circles.feature.settings.deactivate.DeactivateAccountDataSource
+import org.futo.circles.feature.sign_up.SignUpDataSource
+import org.futo.circles.feature.sign_up.setup_circles.SetupCirclesDataSource
+import org.futo.circles.feature.sign_up.setup_profile.SetupProfileDataSource
+import org.futo.circles.feature.sign_up.sign_up_type.SelectSignUpTypeDataSource
+import org.futo.circles.feature.sign_up.terms.AcceptTermsDataSource
+import org.futo.circles.feature.sign_up.validate_email.ValidateEmailDataSource
+import org.futo.circles.feature.sign_up.validate_token.ValidateTokenDataSource
+import org.futo.circles.feature.timeline.data_source.SendMessageDataSource
+import org.futo.circles.feature.timeline.data_source.TimelineBuilder
+import org.futo.circles.feature.timeline.data_source.TimelineDataSource
+import org.futo.circles.feature.timeline.post.PostOptionsDataSource
+import org.futo.circles.feature.timeline.post.emoji.EmojiDataSource
+import org.futo.circles.feature.timeline.post.report.ReportDataSource
+import org.futo.circles.model.CircleRoomTypeArg
import org.koin.dsl.module
val dataSourceModule = module {
diff --git a/app/src/main/java/com/futo/circles/di/Modules.kt b/app/src/main/java/org/futo/circles/di/Modules.kt
similarity index 68%
rename from app/src/main/java/com/futo/circles/di/Modules.kt
rename to app/src/main/java/org/futo/circles/di/Modules.kt
index d7324146b..3c41617b3 100644
--- a/app/src/main/java/com/futo/circles/di/Modules.kt
+++ b/app/src/main/java/org/futo/circles/di/Modules.kt
@@ -1,3 +1,3 @@
-package com.futo.circles.di
+package org.futo.circles.di
val applicationModules = listOf(uiModule, dataSourceModule)
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/circles/di/UiModule.kt b/app/src/main/java/org/futo/circles/di/UiModule.kt
similarity index 58%
rename from app/src/main/java/com/futo/circles/di/UiModule.kt
rename to app/src/main/java/org/futo/circles/di/UiModule.kt
index b51e004da..732215794 100644
--- a/app/src/main/java/com/futo/circles/di/UiModule.kt
+++ b/app/src/main/java/org/futo/circles/di/UiModule.kt
@@ -1,39 +1,39 @@
-package com.futo.circles.di
+package org.futo.circles.di
-import com.futo.circles.feature.circles.CirclesViewModel
-import com.futo.circles.feature.circles.accept_invite.AcceptCircleInviteViewModel
-import com.futo.circles.feature.circles.following.FollowingViewModel
-import com.futo.circles.feature.groups.GroupsViewModel
-import com.futo.circles.feature.log_in.LogInViewModel
-import com.futo.circles.feature.people.PeopleViewModel
-import com.futo.circles.feature.people.user.UserViewModel
-import com.futo.circles.feature.photos.PhotosViewModel
-import com.futo.circles.feature.photos.gallery.GalleryViewModel
-import com.futo.circles.feature.photos.preview.GalleryImageViewModel
-import com.futo.circles.feature.photos.save.SaveToGalleryViewModel
-import com.futo.circles.feature.room.create_room.CreateRoomViewModel
-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.room.select_users.SelectUsersViewModel
-import com.futo.circles.feature.room.update_room.UpdateRoomViewModel
-import com.futo.circles.feature.settings.SettingsViewModel
-import com.futo.circles.feature.settings.active_sessions.ActiveSessionsViewModel
-import com.futo.circles.feature.settings.active_sessions.remove_session.RemoveSessionViewModel
-import com.futo.circles.feature.settings.change_password.ChangePasswordViewModel
-import com.futo.circles.feature.settings.deactivate.DeactivateAccountViewModel
-import com.futo.circles.feature.settings.edit_profile.EditProfileViewModel
-import com.futo.circles.feature.sign_up.SignUpViewModel
-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.sign_up_type.SelectSignUpTypeViewModel
-import com.futo.circles.feature.sign_up.terms.AcceptTermsViewModel
-import com.futo.circles.feature.sign_up.validate_email.ValidateEmailViewModel
-import com.futo.circles.feature.sign_up.validate_token.ValidateTokenViewModel
-import com.futo.circles.feature.timeline.TimelineViewModel
-import com.futo.circles.feature.timeline.post.emoji.EmojiViewModel
-import com.futo.circles.feature.timeline.post.report.ReportViewModel
-import com.futo.circles.model.CircleRoomTypeArg
+import org.futo.circles.feature.circles.CirclesViewModel
+import org.futo.circles.feature.circles.accept_invite.AcceptCircleInviteViewModel
+import org.futo.circles.feature.circles.following.FollowingViewModel
+import org.futo.circles.feature.groups.GroupsViewModel
+import org.futo.circles.feature.log_in.LogInViewModel
+import org.futo.circles.feature.people.PeopleViewModel
+import org.futo.circles.feature.people.user.UserViewModel
+import org.futo.circles.feature.photos.PhotosViewModel
+import org.futo.circles.feature.photos.gallery.GalleryViewModel
+import org.futo.circles.feature.photos.preview.GalleryImageViewModel
+import org.futo.circles.feature.photos.save.SaveToGalleryViewModel
+import org.futo.circles.feature.room.create_room.CreateRoomViewModel
+import org.futo.circles.feature.room.invite.InviteMembersViewModel
+import org.futo.circles.feature.room.manage_members.ManageMembersViewModel
+import org.futo.circles.feature.room.manage_members.change_role.ChangeAccessLevelViewModel
+import org.futo.circles.feature.room.select_users.SelectUsersViewModel
+import org.futo.circles.feature.room.update_room.UpdateRoomViewModel
+import org.futo.circles.feature.settings.SettingsViewModel
+import org.futo.circles.feature.settings.active_sessions.ActiveSessionsViewModel
+import org.futo.circles.feature.settings.active_sessions.remove_session.RemoveSessionViewModel
+import org.futo.circles.feature.settings.change_password.ChangePasswordViewModel
+import org.futo.circles.feature.settings.deactivate.DeactivateAccountViewModel
+import org.futo.circles.feature.settings.edit_profile.EditProfileViewModel
+import org.futo.circles.feature.sign_up.SignUpViewModel
+import org.futo.circles.feature.sign_up.setup_circles.SetupCirclesViewModel
+import org.futo.circles.feature.sign_up.setup_profile.SetupProfileViewModel
+import org.futo.circles.feature.sign_up.sign_up_type.SelectSignUpTypeViewModel
+import org.futo.circles.feature.sign_up.terms.AcceptTermsViewModel
+import org.futo.circles.feature.sign_up.validate_email.ValidateEmailViewModel
+import org.futo.circles.feature.sign_up.validate_token.ValidateTokenViewModel
+import org.futo.circles.feature.timeline.TimelineViewModel
+import org.futo.circles.feature.timeline.post.emoji.EmojiViewModel
+import org.futo.circles.feature.timeline.post.report.ReportViewModel
+import org.futo.circles.model.CircleRoomTypeArg
import org.koin.androidx.viewmodel.dsl.viewModel
import org.koin.core.parameter.parametersOf
import org.koin.dsl.module
diff --git a/app/src/main/java/com/futo/circles/extensions/BitmapExtensions.kt b/app/src/main/java/org/futo/circles/extensions/BitmapExtensions.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/extensions/BitmapExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/BitmapExtensions.kt
index 41e0aaf64..8d5974f49 100644
--- a/app/src/main/java/com/futo/circles/extensions/BitmapExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/BitmapExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
import android.content.Context
import android.graphics.Bitmap
diff --git a/app/src/main/java/com/futo/circles/extensions/ContextExtensions.kt b/app/src/main/java/org/futo/circles/extensions/ContextExtensions.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/extensions/ContextExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/ContextExtensions.kt
index 3301c864e..601355a47 100644
--- a/app/src/main/java/com/futo/circles/extensions/ContextExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/ContextExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
import android.content.Context
import androidx.annotation.DimenRes
diff --git a/app/src/main/java/com/futo/circles/extensions/CoroutinesExtensions.kt b/app/src/main/java/org/futo/circles/extensions/CoroutinesExtensions.kt
similarity index 84%
rename from app/src/main/java/com/futo/circles/extensions/CoroutinesExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/CoroutinesExtensions.kt
index 62fa8327c..02745e79b 100644
--- a/app/src/main/java/com/futo/circles/extensions/CoroutinesExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/CoroutinesExtensions.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
-import com.futo.circles.extensions.DispatcherHolder.BG
-import com.futo.circles.extensions.DispatcherHolder.UI
+import org.futo.circles.extensions.DispatcherHolder.BG
+import org.futo.circles.extensions.DispatcherHolder.UI
import kotlinx.coroutines.CoroutineExceptionHandler
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/futo/circles/extensions/FileExtensions.kt b/app/src/main/java/org/futo/circles/extensions/FileExtensions.kt
similarity index 73%
rename from app/src/main/java/com/futo/circles/extensions/FileExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/FileExtensions.kt
index 76aacd565..a67b83e06 100644
--- a/app/src/main/java/com/futo/circles/extensions/FileExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/FileExtensions.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
import android.content.Context
import android.net.Uri
import androidx.core.content.FileProvider
-import com.futo.circles.core.FILE_PROVIDER_AUTHORITY_PREFIX
+import org.futo.circles.core.FILE_PROVIDER_AUTHORITY_PREFIX
import java.io.File
fun File.getUri(context: Context): Uri = FileProvider.getUriForFile(
diff --git a/app/src/main/java/com/futo/circles/extensions/FragmentExtensions.kt b/app/src/main/java/org/futo/circles/extensions/FragmentExtensions.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/extensions/FragmentExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/FragmentExtensions.kt
index 27d097d80..c16aa7013 100644
--- a/app/src/main/java/com/futo/circles/extensions/FragmentExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/FragmentExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
import android.annotation.SuppressLint
import android.graphics.Color
@@ -14,7 +14,7 @@ import androidx.appcompat.widget.Toolbar
import androidx.browser.customtabs.CustomTabsIntent
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
-import com.futo.circles.R
+import org.futo.circles.R
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.snackbar.Snackbar
diff --git a/app/src/main/java/com/futo/circles/extensions/GalleryImageItemExtensions.kt b/app/src/main/java/org/futo/circles/extensions/GalleryImageItemExtensions.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/extensions/GalleryImageItemExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/GalleryImageItemExtensions.kt
index 8aec47aa9..ee0c3b85b 100644
--- a/app/src/main/java/com/futo/circles/extensions/GalleryImageItemExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/GalleryImageItemExtensions.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
import android.util.Size
import android.widget.ImageView
-import com.futo.circles.R
-import com.futo.circles.model.GalleryImageListItem
+import org.futo.circles.R
+import org.futo.circles.model.GalleryImageListItem
fun GalleryImageListItem.loadInto(imageView: ImageView) {
if (imageContent.fileUrl.startsWith(UriContentScheme)) {
diff --git a/app/src/main/java/com/futo/circles/extensions/ImageViewExtensions.kt b/app/src/main/java/org/futo/circles/extensions/ImageViewExtensions.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/extensions/ImageViewExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/ImageViewExtensions.kt
index 62a394711..ce7d840e2 100644
--- a/app/src/main/java/com/futo/circles/extensions/ImageViewExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/ImageViewExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
import android.graphics.Color
import android.graphics.drawable.Drawable
@@ -9,10 +9,10 @@ import com.amulyakhare.textdrawable.util.ColorGenerator
import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
import com.bumptech.glide.request.target.Target
-import com.futo.circles.R
-import com.futo.circles.glide.GlideApp
-import com.futo.circles.model.ImageContent
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.glide.GlideApp
+import org.futo.circles.model.ImageContent
+import org.futo.circles.provider.MatrixSessionProvider
fun ImageView.loadImage(
@@ -38,7 +38,7 @@ fun ImageView.loadEncryptedImage(
val loadHeight = if (loadOriginalSize) Target.SIZE_ORIGINAL else preferredSize?.height ?: height
content.elementToDecrypt?.let {
- GlideApp
+ org.futo.circles.glide.GlideApp
.with(context)
.load(content)
.transition(DrawableTransitionOptions.withCrossFade())
diff --git a/app/src/main/java/com/futo/circles/extensions/LiveDataExtensions.kt b/app/src/main/java/org/futo/circles/extensions/LiveDataExtensions.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/extensions/LiveDataExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/LiveDataExtensions.kt
index b7c79b206..921d7a541 100644
--- a/app/src/main/java/com/futo/circles/extensions/LiveDataExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/LiveDataExtensions.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
import androidx.fragment.app.Fragment
import androidx.lifecycle.LiveData
-import com.futo.circles.core.ErrorParser
-import com.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.core.ErrorParser
+import org.futo.circles.core.fragment.HasLoadingState
fun <T> LiveData<Response<T>>.observeResponse(
fragment: Fragment,
diff --git a/app/src/main/java/com/futo/circles/extensions/MatrixRoomExtensions.kt b/app/src/main/java/org/futo/circles/extensions/MatrixRoomExtensions.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/extensions/MatrixRoomExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/MatrixRoomExtensions.kt
index 227d92b8a..ae9523ea7 100644
--- a/app/src/main/java/com/futo/circles/extensions/MatrixRoomExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/MatrixRoomExtensions.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
-import com.futo.circles.model.TIMELINE_TAG
-import com.futo.circles.model.TIMELINE_TYPE
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.model.TIMELINE_TAG
+import org.futo.circles.model.TIMELINE_TYPE
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.getRoom
import org.matrix.android.sdk.api.session.room.Room
diff --git a/app/src/main/java/com/futo/circles/extensions/MatrixSessionExtensions.kt b/app/src/main/java/org/futo/circles/extensions/MatrixSessionExtensions.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/extensions/MatrixSessionExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/MatrixSessionExtensions.kt
index dab47c28f..4fca3e348 100644
--- a/app/src/main/java/com/futo/circles/extensions/MatrixSessionExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/MatrixSessionExtensions.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
import android.util.Size
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.provider.MatrixSessionProvider
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
diff --git a/app/src/main/java/com/futo/circles/extensions/MatrixTermsExtension.kt b/app/src/main/java/org/futo/circles/extensions/MatrixTermsExtension.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/extensions/MatrixTermsExtension.kt
rename to app/src/main/java/org/futo/circles/extensions/MatrixTermsExtension.kt
index 66edd7671..9a2810c0f 100644
--- a/app/src/main/java/com/futo/circles/extensions/MatrixTermsExtension.kt
+++ b/app/src/main/java/org/futo/circles/extensions/MatrixTermsExtension.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
-import com.futo.circles.model.TermsListItem
+import org.futo.circles.model.TermsListItem
import org.matrix.android.sdk.api.auth.registration.TermPolicies
import org.matrix.android.sdk.api.auth.toLocalizedLoginTerms
diff --git a/app/src/main/java/com/futo/circles/extensions/MatrixUserRoleExtensions.kt b/app/src/main/java/org/futo/circles/extensions/MatrixUserRoleExtensions.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/extensions/MatrixUserRoleExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/MatrixUserRoleExtensions.kt
index 6bd5e651e..897cb54dd 100644
--- a/app/src/main/java/com/futo/circles/extensions/MatrixUserRoleExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/MatrixUserRoleExtensions.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
-import com.futo.circles.R
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.events.model.EventType
import org.matrix.android.sdk.api.session.events.model.toModel
import org.matrix.android.sdk.api.session.getRoom
diff --git a/app/src/main/java/com/futo/circles/extensions/RecyclerViewExtensions.kt b/app/src/main/java/org/futo/circles/extensions/RecyclerViewExtensions.kt
similarity index 95%
rename from app/src/main/java/com/futo/circles/extensions/RecyclerViewExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/RecyclerViewExtensions.kt
index 7a375c134..9c8481c44 100644
--- a/app/src/main/java/com/futo/circles/extensions/RecyclerViewExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/RecyclerViewExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
import android.view.View
diff --git a/app/src/main/java/com/futo/circles/extensions/SearchViewExtensions.kt b/app/src/main/java/org/futo/circles/extensions/SearchViewExtensions.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/extensions/SearchViewExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/SearchViewExtensions.kt
index a76978cbb..cd54968a3 100644
--- a/app/src/main/java/com/futo/circles/extensions/SearchViewExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/SearchViewExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
import androidx.appcompat.widget.SearchView
import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/app/src/main/java/com/futo/circles/extensions/StringExtensions.kt b/app/src/main/java/org/futo/circles/extensions/StringExtensions.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/extensions/StringExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/StringExtensions.kt
index 9921841e9..48661963d 100644
--- a/app/src/main/java/com/futo/circles/extensions/StringExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/StringExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
import android.util.Patterns
diff --git a/app/src/main/java/com/futo/circles/extensions/TextInputLayoutExtensions.kt b/app/src/main/java/org/futo/circles/extensions/TextInputLayoutExtensions.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/extensions/TextInputLayoutExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/TextInputLayoutExtensions.kt
index 30162211b..df1074283 100644
--- a/app/src/main/java/com/futo/circles/extensions/TextInputLayoutExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/TextInputLayoutExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
import com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/java/com/futo/circles/extensions/UriExtensions.kt b/app/src/main/java/org/futo/circles/extensions/UriExtensions.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/extensions/UriExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/UriExtensions.kt
index ece2b8803..672f02764 100644
--- a/app/src/main/java/com/futo/circles/extensions/UriExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/UriExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
import android.content.Context
import android.net.Uri
@@ -6,7 +6,7 @@ import android.provider.MediaStore
import android.provider.OpenableColumns
import androidx.core.database.getLongOrNull
import androidx.core.database.getStringOrNull
-import com.futo.circles.core.ImageUtils
+import org.futo.circles.core.ImageUtils
import org.matrix.android.sdk.api.session.content.ContentAttachmentData
import java.io.File
diff --git a/app/src/main/java/com/futo/circles/extensions/ViewExtensions.kt b/app/src/main/java/org/futo/circles/extensions/ViewExtensions.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/extensions/ViewExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/ViewExtensions.kt
index 5aee98b65..6376a9da9 100644
--- a/app/src/main/java/com/futo/circles/extensions/ViewExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/ViewExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
import android.R
import android.content.res.TypedArray
diff --git a/app/src/main/java/com/futo/circles/extensions/ViewModelExtensions.kt b/app/src/main/java/org/futo/circles/extensions/ViewModelExtensions.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/extensions/ViewModelExtensions.kt
rename to app/src/main/java/org/futo/circles/extensions/ViewModelExtensions.kt
index 89597ca97..b3c3dd1f8 100644
--- a/app/src/main/java/com/futo/circles/extensions/ViewModelExtensions.kt
+++ b/app/src/main/java/org/futo/circles/extensions/ViewModelExtensions.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.extensions
+package org.futo.circles.extensions
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
diff --git a/app/src/main/java/com/futo/circles/feature/bottom_navigation/BottomNavigationFragment.kt b/app/src/main/java/org/futo/circles/feature/bottom_navigation/BottomNavigationFragment.kt
similarity index 88%
rename from app/src/main/java/com/futo/circles/feature/bottom_navigation/BottomNavigationFragment.kt
rename to app/src/main/java/org/futo/circles/feature/bottom_navigation/BottomNavigationFragment.kt
index c0b55b3d3..ffe650134 100644
--- a/app/src/main/java/com/futo/circles/feature/bottom_navigation/BottomNavigationFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/bottom_navigation/BottomNavigationFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.bottom_navigation
+package org.futo.circles.feature.bottom_navigation
import android.os.Bundle
import android.view.View
@@ -8,9 +8,9 @@ import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.ui.AppBarConfiguration
import androidx.navigation.ui.setupWithNavController
import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.databinding.BottomNavigationFragmentBinding
-import com.futo.circles.extensions.setSupportActionBar
+import org.futo.circles.R
+import org.futo.circles.databinding.BottomNavigationFragmentBinding
+import org.futo.circles.extensions.setSupportActionBar
class BottomNavigationFragment : Fragment(R.layout.bottom_navigation_fragment) {
diff --git a/app/src/main/java/com/futo/circles/feature/circles/CirclesDataSource.kt b/app/src/main/java/org/futo/circles/feature/circles/CirclesDataSource.kt
similarity index 70%
rename from app/src/main/java/com/futo/circles/feature/circles/CirclesDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/circles/CirclesDataSource.kt
index c1212d5ac..338ae1e28 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/CirclesDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/CirclesDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.circles
+package org.futo.circles.feature.circles
-import com.futo.circles.core.rooms.data_source.RoomsDataSource
-import com.futo.circles.mapping.toInviteCircleListItem
-import com.futo.circles.mapping.toJoinedCircleListItem
-import com.futo.circles.model.CIRCLE_TAG
-import com.futo.circles.model.RoomListItem
-import com.futo.circles.model.TIMELINE_TYPE
+import org.futo.circles.core.rooms.data_source.RoomsDataSource
+import org.futo.circles.mapping.toInviteCircleListItem
+import org.futo.circles.mapping.toJoinedCircleListItem
+import org.futo.circles.model.CIRCLE_TAG
+import org.futo.circles.model.RoomListItem
+import org.futo.circles.model.TIMELINE_TYPE
import org.matrix.android.sdk.api.session.room.model.Membership
import org.matrix.android.sdk.api.session.room.model.RoomSummary
diff --git a/app/src/main/java/com/futo/circles/feature/circles/CirclesFragment.kt b/app/src/main/java/org/futo/circles/feature/circles/CirclesFragment.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/circles/CirclesFragment.kt
rename to app/src/main/java/org/futo/circles/feature/circles/CirclesFragment.kt
index d2b56341a..77ffb50ae 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/CirclesFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/CirclesFragment.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.circles
+package org.futo.circles.feature.circles
import androidx.navigation.fragment.findNavController
-import com.futo.circles.core.rooms.HasInvites
-import com.futo.circles.core.rooms.RoomsFragment
-import com.futo.circles.model.RoomListItem
+import org.futo.circles.core.rooms.HasInvites
+import org.futo.circles.core.rooms.RoomsFragment
+import org.futo.circles.model.RoomListItem
import org.koin.androidx.viewmodel.ext.android.viewModel
class CirclesFragment : RoomsFragment(), HasInvites {
diff --git a/app/src/main/java/com/futo/circles/feature/circles/CirclesViewModel.kt b/app/src/main/java/org/futo/circles/feature/circles/CirclesViewModel.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/feature/circles/CirclesViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/circles/CirclesViewModel.kt
index 08372083c..20ba889ea 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/CirclesViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/CirclesViewModel.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.circles
+package org.futo.circles.feature.circles
import androidx.lifecycle.map
-import com.futo.circles.core.rooms.RoomsViewModel
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.rooms.RoomsViewModel
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
class CirclesViewModel(
diff --git a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDataSource.kt b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDataSource.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDataSource.kt
index fc929945e..a386d5e19 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDataSource.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.circles.accept_invite
+package org.futo.circles.feature.circles.accept_invite
import androidx.lifecycle.MutableLiveData
-import com.futo.circles.core.matrix.room.RoomRelationsBuilder
-import com.futo.circles.extensions.createResult
-import com.futo.circles.mapping.toSelectableRoomListItem
-import com.futo.circles.model.CIRCLE_TAG
-import com.futo.circles.model.SelectableRoomListItem
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.matrix.room.RoomRelationsBuilder
+import org.futo.circles.extensions.createResult
+import org.futo.circles.mapping.toSelectableRoomListItem
+import org.futo.circles.model.CIRCLE_TAG
+import org.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.room.model.Membership
import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
diff --git a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDialogFragment.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDialogFragment.kt
index 818f00950..8f7930b1b 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDialogFragment.kt
@@ -1,18 +1,18 @@
-package com.futo.circles.feature.circles.accept_invite
+package org.futo.circles.feature.circles.accept_invite
import android.os.Bundle
import android.view.View
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.navArgs
import androidx.recyclerview.widget.DividerItemDecoration
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.databinding.AcceptCircleInviteDialogFragmentBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.feature.circles.accept_invite.list.CirclesInviteAdapter
-import com.futo.circles.feature.circles.accept_invite.list.selected.SelectedCirclesAdapter
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.AcceptCircleInviteDialogFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.feature.circles.accept_invite.list.CirclesInviteAdapter
+import org.futo.circles.feature.circles.accept_invite.list.selected.SelectedCirclesAdapter
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/circles/accept_invite/AcceptCircleInviteViewModel.kt b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteViewModel.kt
similarity index 69%
rename from app/src/main/java/com/futo/circles/feature/circles/accept_invite/AcceptCircleInviteViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteViewModel.kt
index ef0b39f88..cef562867 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/AcceptCircleInviteViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteViewModel.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.circles.accept_invite
+package org.futo.circles.feature.circles.accept_invite
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.model.SelectableRoomListItem
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.model.SelectableRoomListItem
class AcceptCircleInviteViewModel(
private val dataSource: AcceptCircleInviteDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/list/CirclesInviteAdapter.kt b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/CirclesInviteAdapter.kt
similarity index 74%
rename from app/src/main/java/com/futo/circles/feature/circles/accept_invite/list/CirclesInviteAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/CirclesInviteAdapter.kt
index d5648900b..6221145a9 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/list/CirclesInviteAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/CirclesInviteAdapter.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.circles.accept_invite.list
+package org.futo.circles.feature.circles.accept_invite.list
import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.RoomListItem
-import com.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.RoomListItem
+import org.futo.circles.model.SelectableRoomListItem
class CirclesInviteAdapter(
private val onCircleSelected: (SelectableRoomListItem) -> Unit
diff --git a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/list/CirclesInviteViewHolder.kt b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/CirclesInviteViewHolder.kt
similarity index 70%
rename from app/src/main/java/com/futo/circles/feature/circles/accept_invite/list/CirclesInviteViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/CirclesInviteViewHolder.kt
index 1c8352453..a52d6981e 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/list/CirclesInviteViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/CirclesInviteViewHolder.kt
@@ -1,15 +1,15 @@
-package com.futo.circles.feature.circles.accept_invite.list
+package org.futo.circles.feature.circles.accept_invite.list
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.R
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.core.list.context
-import com.futo.circles.databinding.AcceptCircleInviteListItemBinding
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.extensions.onClick
-import com.futo.circles.extensions.setSelectableItemBackground
-import com.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.R
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.core.list.context
+import org.futo.circles.databinding.AcceptCircleInviteListItemBinding
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.extensions.onClick
+import org.futo.circles.extensions.setSelectableItemBackground
+import org.futo.circles.model.SelectableRoomListItem
class CirclesInviteViewHolder(
parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/list/selected/SelectedCirclesAdapter.kt b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/selected/SelectedCirclesAdapter.kt
similarity index 70%
rename from app/src/main/java/com/futo/circles/feature/circles/accept_invite/list/selected/SelectedCirclesAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/selected/SelectedCirclesAdapter.kt
index 858b62c96..76c4879df 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/accept_invite/list/selected/SelectedCirclesAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/selected/SelectedCirclesAdapter.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.circles.accept_invite.list.selected
+package org.futo.circles.feature.circles.accept_invite.list.selected
import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.core.list.ChipItemViewHolder
-import com.futo.circles.model.RoomListItem
-import com.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.core.list.ChipItemViewHolder
+import org.futo.circles.model.RoomListItem
+import org.futo.circles.model.SelectableRoomListItem
class SelectedCirclesAdapter(
private val onCircleDeselected: (SelectableRoomListItem) -> Unit
diff --git a/app/src/main/java/com/futo/circles/feature/circles/following/FollowingDataSource.kt b/app/src/main/java/org/futo/circles/feature/circles/following/FollowingDataSource.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/circles/following/FollowingDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/circles/following/FollowingDataSource.kt
index 458c55ca9..1da63b2bd 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/following/FollowingDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/following/FollowingDataSource.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.circles.following
+package org.futo.circles.feature.circles.following
import android.content.Context
import androidx.lifecycle.map
-import com.futo.circles.R
-import com.futo.circles.core.matrix.room.RoomRelationsBuilder
-import com.futo.circles.extensions.createResult
-import com.futo.circles.mapping.toFollowingListItem
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.core.matrix.room.RoomRelationsBuilder
+import org.futo.circles.extensions.createResult
+import org.futo.circles.mapping.toFollowingListItem
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.getRoom
class FollowingDataSource(
diff --git a/app/src/main/java/com/futo/circles/feature/circles/following/FollowingDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/circles/following/FollowingDialogFragment.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/circles/following/FollowingDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/circles/following/FollowingDialogFragment.kt
index 98dbf36e6..32b926085 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/following/FollowingDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/following/FollowingDialogFragment.kt
@@ -1,15 +1,15 @@
-package com.futo.circles.feature.circles.following
+package org.futo.circles.feature.circles.following
import android.os.Bundle
import android.view.View
import androidx.navigation.fragment.navArgs
import androidx.recyclerview.widget.DividerItemDecoration
-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.circles.following.list.FollowingAdapter
-import com.futo.circles.model.FollowingListItem
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.databinding.FollowingDialogFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.feature.circles.following.list.FollowingAdapter
+import org.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/circles/following/FollowingViewModel.kt b/app/src/main/java/org/futo/circles/feature/circles/following/FollowingViewModel.kt
similarity index 77%
rename from app/src/main/java/com/futo/circles/feature/circles/following/FollowingViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/circles/following/FollowingViewModel.kt
index e482cd08b..554ef93a2 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/following/FollowingViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/following/FollowingViewModel.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.circles.following
+package org.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 org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
class FollowingViewModel(
private val dataSource: FollowingDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/circles/following/RemoveFollowingDialog.kt b/app/src/main/java/org/futo/circles/feature/circles/following/RemoveFollowingDialog.kt
similarity index 89%
rename from app/src/main/java/com/futo/circles/feature/circles/following/RemoveFollowingDialog.kt
rename to app/src/main/java/org/futo/circles/feature/circles/following/RemoveFollowingDialog.kt
index e8abbfd54..96f92f88f 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/following/RemoveFollowingDialog.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/following/RemoveFollowingDialog.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.circles.following
+package org.futo.circles.feature.circles.following
import android.content.Context
import android.os.Bundle
import android.view.LayoutInflater
import androidx.appcompat.app.AppCompatDialog
-import com.futo.circles.R
-import com.futo.circles.databinding.RemoveFollowingDialogBinding
+import org.futo.circles.R
+import org.futo.circles.databinding.RemoveFollowingDialogBinding
interface RemoveFollowingListener {
fun onRemove(roomId: String)
diff --git a/app/src/main/java/com/futo/circles/feature/circles/following/list/FollowingAdapter.kt b/app/src/main/java/org/futo/circles/feature/circles/following/list/FollowingAdapter.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/feature/circles/following/list/FollowingAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/circles/following/list/FollowingAdapter.kt
index ad9946930..f46637c93 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/following/list/FollowingAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/following/list/FollowingAdapter.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.circles.following.list
+package org.futo.circles.feature.circles.following.list
import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.FollowingListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.FollowingListItem
class FollowingAdapter(
private val onRemoveClicked: (FollowingListItem) -> Unit
diff --git a/app/src/main/java/com/futo/circles/feature/circles/following/list/FollowingViewHolder.kt b/app/src/main/java/org/futo/circles/feature/circles/following/list/FollowingViewHolder.kt
similarity index 70%
rename from app/src/main/java/com/futo/circles/feature/circles/following/list/FollowingViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/circles/following/list/FollowingViewHolder.kt
index 219a382b6..ba26c71f0 100644
--- a/app/src/main/java/com/futo/circles/feature/circles/following/list/FollowingViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/circles/following/list/FollowingViewHolder.kt
@@ -1,16 +1,16 @@
-package com.futo.circles.feature.circles.following.list
+package org.futo.circles.feature.circles.following.list
import android.text.format.DateUtils
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.R
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.core.list.context
-import com.futo.circles.databinding.FollowingListItemBinding
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.extensions.onClick
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.model.FollowingListItem
+import org.futo.circles.R
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.core.list.context
+import org.futo.circles.databinding.FollowingListItemBinding
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.extensions.onClick
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.model.FollowingListItem
class FollowingViewHolder(
parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/feature/groups/GroupsDataSource.kt b/app/src/main/java/org/futo/circles/feature/groups/GroupsDataSource.kt
similarity index 68%
rename from app/src/main/java/com/futo/circles/feature/groups/GroupsDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/groups/GroupsDataSource.kt
index 3b363f352..66e80d026 100644
--- a/app/src/main/java/com/futo/circles/feature/groups/GroupsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/groups/GroupsDataSource.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.groups
+package org.futo.circles.feature.groups
-import com.futo.circles.core.matrix.room.RoomRelationsBuilder
-import com.futo.circles.core.rooms.data_source.RoomsDataSource
-import com.futo.circles.extensions.createResult
-import com.futo.circles.mapping.toInviteGroupListItem
-import com.futo.circles.mapping.toJoinedGroupListItem
-import com.futo.circles.model.GROUP_TYPE
-import com.futo.circles.model.RoomListItem
+import org.futo.circles.core.matrix.room.RoomRelationsBuilder
+import org.futo.circles.core.rooms.data_source.RoomsDataSource
+import org.futo.circles.extensions.createResult
+import org.futo.circles.mapping.toInviteGroupListItem
+import org.futo.circles.mapping.toJoinedGroupListItem
+import org.futo.circles.model.GROUP_TYPE
+import org.futo.circles.model.RoomListItem
import org.matrix.android.sdk.api.session.room.model.Membership
import org.matrix.android.sdk.api.session.room.model.RoomSummary
diff --git a/app/src/main/java/com/futo/circles/feature/groups/GroupsFragment.kt b/app/src/main/java/org/futo/circles/feature/groups/GroupsFragment.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/groups/GroupsFragment.kt
rename to app/src/main/java/org/futo/circles/feature/groups/GroupsFragment.kt
index 1f895be8d..9b3c40f89 100644
--- a/app/src/main/java/com/futo/circles/feature/groups/GroupsFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/groups/GroupsFragment.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.groups
+package org.futo.circles.feature.groups
import androidx.navigation.fragment.findNavController
-import com.futo.circles.core.rooms.HasInvites
-import com.futo.circles.core.rooms.RoomsFragment
-import com.futo.circles.model.RoomListItem
+import org.futo.circles.core.rooms.HasInvites
+import org.futo.circles.core.rooms.RoomsFragment
+import org.futo.circles.model.RoomListItem
import org.koin.androidx.viewmodel.ext.android.viewModel
class GroupsFragment : RoomsFragment(), HasInvites {
diff --git a/app/src/main/java/com/futo/circles/feature/groups/GroupsViewModel.kt b/app/src/main/java/org/futo/circles/feature/groups/GroupsViewModel.kt
similarity index 74%
rename from app/src/main/java/com/futo/circles/feature/groups/GroupsViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/groups/GroupsViewModel.kt
index b550883a7..6c2a516ee 100644
--- a/app/src/main/java/com/futo/circles/feature/groups/GroupsViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/groups/GroupsViewModel.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.groups
+package org.futo.circles.feature.groups
import androidx.lifecycle.map
-import com.futo.circles.core.rooms.RoomsViewModel
-import com.futo.circles.extensions.launchBg
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.rooms.RoomsViewModel
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
class GroupsViewModel(
diff --git a/app/src/main/java/com/futo/circles/feature/log_in/LogInFragment.kt b/app/src/main/java/org/futo/circles/feature/log_in/LogInFragment.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/feature/log_in/LogInFragment.kt
rename to app/src/main/java/org/futo/circles/feature/log_in/LogInFragment.kt
index 3a72113a0..9b7010324 100644
--- a/app/src/main/java/com/futo/circles/feature/log_in/LogInFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/log_in/LogInFragment.kt
@@ -1,17 +1,17 @@
-package com.futo.circles.feature.log_in
+package org.futo.circles.feature.log_in
import android.os.Bundle
import android.view.View
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.core.matrix.pass_phrase.LoadingDialog
-import com.futo.circles.databinding.LogInFragmentBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showError
+import org.futo.circles.R
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.core.matrix.pass_phrase.LoadingDialog
+import org.futo.circles.databinding.LogInFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showError
import org.koin.androidx.viewmodel.ext.android.viewModel
diff --git a/app/src/main/java/com/futo/circles/feature/log_in/LogInViewModel.kt b/app/src/main/java/org/futo/circles/feature/log_in/LogInViewModel.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/feature/log_in/LogInViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/log_in/LogInViewModel.kt
index 6d12eb878..8ff34a36f 100644
--- a/app/src/main/java/com/futo/circles/feature/log_in/LogInViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/log_in/LogInViewModel.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.log_in
+package org.futo.circles.feature.log_in
import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
import org.matrix.android.sdk.api.auth.data.LoginFlowResult
import org.matrix.android.sdk.api.session.Session
diff --git a/app/src/main/java/com/futo/circles/feature/log_in/LoginDataSource.kt b/app/src/main/java/org/futo/circles/feature/log_in/LoginDataSource.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/feature/log_in/LoginDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/log_in/LoginDataSource.kt
index 387993348..3fc9fe1f7 100644
--- a/app/src/main/java/com/futo/circles/feature/log_in/LoginDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/log_in/LoginDataSource.kt
@@ -1,14 +1,14 @@
-package com.futo.circles.feature.log_in
+package org.futo.circles.feature.log_in
import android.content.Context
import android.net.Uri
-import com.futo.circles.BuildConfig
-import com.futo.circles.R
-import com.futo.circles.core.matrix.pass_phrase.restore.RestorePassPhraseDataSource
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.createResult
-import com.futo.circles.provider.MatrixInstanceProvider
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.BuildConfig
+import org.futo.circles.R
+import org.futo.circles.core.matrix.pass_phrase.restore.RestorePassPhraseDataSource
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.provider.MatrixInstanceProvider
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
import org.matrix.android.sdk.api.session.Session
@@ -20,7 +20,7 @@ class LoginDataSource(
private val homeServerConnectionConfig by lazy {
HomeServerConnectionConfig
.Builder()
- .withHomeServerUri(Uri.parse(BuildConfig.MATRIX_HOME_SERVER_URL))
+ .withHomeServerUri(Uri.parse(org.futo.circles.BuildConfig.MATRIX_HOME_SERVER_URL))
.build()
}
diff --git a/app/src/main/java/com/futo/circles/feature/people/PeopleDataSource.kt b/app/src/main/java/org/futo/circles/feature/people/PeopleDataSource.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/feature/people/PeopleDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/people/PeopleDataSource.kt
index 6d61d0018..2b4ce1a26 100644
--- a/app/src/main/java/com/futo/circles/feature/people/PeopleDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/PeopleDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.people
+package org.futo.circles.feature.people
import androidx.lifecycle.asFlow
-import com.futo.circles.core.DEFAULT_USER_PREFIX
-import com.futo.circles.mapping.toPeopleUserListItem
-import com.futo.circles.model.PeopleHeaderItem
-import com.futo.circles.model.PeopleListItem
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.DEFAULT_USER_PREFIX
+import org.futo.circles.mapping.toPeopleUserListItem
+import org.futo.circles.model.PeopleHeaderItem
+import org.futo.circles.model.PeopleListItem
+import org.futo.circles.provider.MatrixSessionProvider
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.*
import org.matrix.android.sdk.api.session.user.model.User
diff --git a/app/src/main/java/com/futo/circles/feature/people/PeopleFragment.kt b/app/src/main/java/org/futo/circles/feature/people/PeopleFragment.kt
similarity index 84%
rename from app/src/main/java/com/futo/circles/feature/people/PeopleFragment.kt
rename to app/src/main/java/org/futo/circles/feature/people/PeopleFragment.kt
index d3e008061..909053152 100644
--- a/app/src/main/java/com/futo/circles/feature/people/PeopleFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/PeopleFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.people
+package org.futo.circles.feature.people
import android.os.Bundle
import android.view.View
@@ -6,13 +6,13 @@ import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.DividerItemDecoration
import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.databinding.PeopleFragmentBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showDialog
-import com.futo.circles.feature.people.list.PeopleAdapter
-import com.futo.circles.model.PeopleUserListItem
+import org.futo.circles.R
+import org.futo.circles.databinding.PeopleFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showDialog
+import org.futo.circles.feature.people.list.PeopleAdapter
+import org.futo.circles.model.PeopleUserListItem
import org.koin.androidx.viewmodel.ext.android.viewModel
class PeopleFragment : Fragment(R.layout.people_fragment) {
diff --git a/app/src/main/java/com/futo/circles/feature/people/PeopleViewModel.kt b/app/src/main/java/org/futo/circles/feature/people/PeopleViewModel.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/people/PeopleViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/people/PeopleViewModel.kt
index 670585c4d..754bd60a6 100644
--- a/app/src/main/java/com/futo/circles/feature/people/PeopleViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/PeopleViewModel.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.people
+package org.futo.circles.feature.people
import androidx.lifecycle.ViewModel
import androidx.lifecycle.asLiveData
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
class PeopleViewModel(
peopleDataSource: PeopleDataSource,
diff --git a/app/src/main/java/com/futo/circles/feature/people/UserOptionsDataSource.kt b/app/src/main/java/org/futo/circles/feature/people/UserOptionsDataSource.kt
similarity index 71%
rename from app/src/main/java/com/futo/circles/feature/people/UserOptionsDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/people/UserOptionsDataSource.kt
index fd10ee9a4..06049d30f 100644
--- a/app/src/main/java/com/futo/circles/feature/people/UserOptionsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/UserOptionsDataSource.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.feature.people
+package org.futo.circles.feature.people
-import com.futo.circles.extensions.createResult
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.extensions.createResult
+import org.futo.circles.provider.MatrixSessionProvider
class UserOptionsDataSource {
diff --git a/app/src/main/java/com/futo/circles/feature/people/list/PeopleAdapter.kt b/app/src/main/java/org/futo/circles/feature/people/list/PeopleAdapter.kt
similarity index 84%
rename from app/src/main/java/com/futo/circles/feature/people/list/PeopleAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/people/list/PeopleAdapter.kt
index 5e966723c..7babd67b1 100644
--- a/app/src/main/java/com/futo/circles/feature/people/list/PeopleAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/list/PeopleAdapter.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.people.list
+package org.futo.circles.feature.people.list
import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.PeopleHeaderItem
-import com.futo.circles.model.PeopleListItem
-import com.futo.circles.model.PeopleUserListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.PeopleHeaderItem
+import org.futo.circles.model.PeopleListItem
+import org.futo.circles.model.PeopleUserListItem
private enum class PeopleListViewType { Header, User }
diff --git a/app/src/main/java/com/futo/circles/feature/people/list/PeopleViewHolder.kt b/app/src/main/java/org/futo/circles/feature/people/list/PeopleViewHolder.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/feature/people/list/PeopleViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/people/list/PeopleViewHolder.kt
index 405321c7a..5cd2b8013 100644
--- a/app/src/main/java/com/futo/circles/feature/people/list/PeopleViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/list/PeopleViewHolder.kt
@@ -1,18 +1,18 @@
-package com.futo.circles.feature.people.list
+package org.futo.circles.feature.people.list
import android.view.View
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.core.list.context
-import com.futo.circles.databinding.InviteHeaderListItemBinding
-import com.futo.circles.databinding.PeopleListItemBinding
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.extensions.onClick
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.model.PeopleHeaderItem
-import com.futo.circles.model.PeopleListItem
-import com.futo.circles.model.PeopleUserListItem
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.core.list.context
+import org.futo.circles.databinding.InviteHeaderListItemBinding
+import org.futo.circles.databinding.PeopleListItemBinding
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.extensions.onClick
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.model.PeopleHeaderItem
+import org.futo.circles.model.PeopleListItem
+import org.futo.circles.model.PeopleUserListItem
abstract class PeopleViewHolder(view: View) : RecyclerView.ViewHolder(view) {
abstract fun bind(data: PeopleListItem)
diff --git a/app/src/main/java/com/futo/circles/feature/people/user/UserDataSource.kt b/app/src/main/java/org/futo/circles/feature/people/user/UserDataSource.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/people/user/UserDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/people/user/UserDataSource.kt
index 198f9f5d7..0825967a3 100644
--- a/app/src/main/java/com/futo/circles/feature/people/user/UserDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/user/UserDataSource.kt
@@ -1,14 +1,14 @@
-package com.futo.circles.feature.people.user
+package org.futo.circles.feature.people.user
import android.content.Context
import androidx.lifecycle.map
-import com.futo.circles.R
-import com.futo.circles.extensions.getRoomOwners
-import com.futo.circles.mapping.toJoinedCircleListItem
-import com.futo.circles.model.CIRCLE_TAG
-import com.futo.circles.model.JoinedCircleListItem
-import com.futo.circles.model.TIMELINE_TYPE
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.extensions.getRoomOwners
+import org.futo.circles.mapping.toJoinedCircleListItem
+import org.futo.circles.model.CIRCLE_TAG
+import org.futo.circles.model.JoinedCircleListItem
+import org.futo.circles.model.TIMELINE_TYPE
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.room.model.Membership
import org.matrix.android.sdk.api.session.room.model.RoomSummary
import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
diff --git a/app/src/main/java/com/futo/circles/feature/people/user/UserFragment.kt b/app/src/main/java/org/futo/circles/feature/people/user/UserFragment.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/feature/people/user/UserFragment.kt
rename to app/src/main/java/org/futo/circles/feature/people/user/UserFragment.kt
index 0b3a8b2fc..c1769c3d6 100644
--- a/app/src/main/java/com/futo/circles/feature/people/user/UserFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/user/UserFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.people.user
+package org.futo.circles.feature.people.user
import android.os.Bundle
import android.view.View
@@ -7,13 +7,13 @@ import androidx.fragment.app.Fragment
import androidx.navigation.fragment.navArgs
import androidx.recyclerview.widget.DividerItemDecoration
import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.databinding.UserFragmentBinding
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.feature.people.user.list.UsersCirclesAdapter
-import com.futo.circles.mapping.notEmptyDisplayName
+import org.futo.circles.R
+import org.futo.circles.databinding.UserFragmentBinding
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.feature.people.user.list.UsersCirclesAdapter
+import org.futo.circles.mapping.notEmptyDisplayName
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf
import org.matrix.android.sdk.api.session.user.model.User
diff --git a/app/src/main/java/com/futo/circles/feature/people/user/UserViewModel.kt b/app/src/main/java/org/futo/circles/feature/people/user/UserViewModel.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/feature/people/user/UserViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/people/user/UserViewModel.kt
index aa75fdf4e..58c0561ad 100644
--- a/app/src/main/java/com/futo/circles/feature/people/user/UserViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/user/UserViewModel.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.people.user
+package org.futo.circles.feature.people.user
import androidx.lifecycle.ViewModel
diff --git a/app/src/main/java/com/futo/circles/feature/people/user/list/UsersCircleViewHolder.kt b/app/src/main/java/org/futo/circles/feature/people/user/list/UsersCircleViewHolder.kt
similarity index 68%
rename from app/src/main/java/com/futo/circles/feature/people/user/list/UsersCircleViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/people/user/list/UsersCircleViewHolder.kt
index 076d5bde4..f2578847d 100644
--- a/app/src/main/java/com/futo/circles/feature/people/user/list/UsersCircleViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/user/list/UsersCircleViewHolder.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.people.user.list
+package org.futo.circles.feature.people.user.list
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.AcceptCircleInviteListItemBinding
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.model.JoinedCircleListItem
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.AcceptCircleInviteListItemBinding
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.model.JoinedCircleListItem
class UsersCircleViewHolder(
parent: ViewGroup
diff --git a/app/src/main/java/com/futo/circles/feature/people/user/list/UsersCirclesAdapter.kt b/app/src/main/java/org/futo/circles/feature/people/user/list/UsersCirclesAdapter.kt
similarity index 74%
rename from app/src/main/java/com/futo/circles/feature/people/user/list/UsersCirclesAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/people/user/list/UsersCirclesAdapter.kt
index e615e42e3..159035637 100644
--- a/app/src/main/java/com/futo/circles/feature/people/user/list/UsersCirclesAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/user/list/UsersCirclesAdapter.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.people.user.list
+package org.futo.circles.feature.people.user.list
import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.JoinedCircleListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.JoinedCircleListItem
class UsersCirclesAdapter() :
BaseRvAdapter<JoinedCircleListItem, UsersCircleViewHolder>(DefaultIdEntityCallback()) {
diff --git a/app/src/main/java/com/futo/circles/feature/photos/PhotosDataSource.kt b/app/src/main/java/org/futo/circles/feature/photos/PhotosDataSource.kt
similarity index 66%
rename from app/src/main/java/com/futo/circles/feature/photos/PhotosDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/photos/PhotosDataSource.kt
index 4b715094f..9c35b24cd 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/PhotosDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/PhotosDataSource.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.photos
+package org.futo.circles.feature.photos
-import com.futo.circles.core.rooms.data_source.RoomsDataSource
-import com.futo.circles.mapping.toGalleryListItem
-import com.futo.circles.model.GALLERY_TYPE
-import com.futo.circles.model.RoomListItem
+import org.futo.circles.core.rooms.data_source.RoomsDataSource
+import org.futo.circles.mapping.toGalleryListItem
+import org.futo.circles.model.GALLERY_TYPE
+import org.futo.circles.model.RoomListItem
import org.matrix.android.sdk.api.session.room.model.Membership
import org.matrix.android.sdk.api.session.room.model.RoomSummary
diff --git a/app/src/main/java/com/futo/circles/feature/photos/PhotosFragment.kt b/app/src/main/java/org/futo/circles/feature/photos/PhotosFragment.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/photos/PhotosFragment.kt
rename to app/src/main/java/org/futo/circles/feature/photos/PhotosFragment.kt
index 3785d7cbe..70941cfc3 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/PhotosFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/PhotosFragment.kt
@@ -1,13 +1,13 @@
-package com.futo.circles.feature.photos
+package org.futo.circles.feature.photos
import android.content.Context
import android.os.Bundle
import android.view.View
import androidx.navigation.fragment.findNavController
-import com.futo.circles.core.image_picker.PickGalleryListener
-import com.futo.circles.core.rooms.RoomsFragment
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.model.RoomListItem
+import org.futo.circles.core.image_picker.PickGalleryListener
+import org.futo.circles.core.rooms.RoomsFragment
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.model.RoomListItem
import org.koin.androidx.viewmodel.ext.android.viewModel
class PhotosFragment : RoomsFragment() {
diff --git a/app/src/main/java/com/futo/circles/feature/photos/PhotosViewModel.kt b/app/src/main/java/org/futo/circles/feature/photos/PhotosViewModel.kt
similarity index 74%
rename from app/src/main/java/com/futo/circles/feature/photos/PhotosViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/photos/PhotosViewModel.kt
index b9912671c..d09b7f914 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/PhotosViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/PhotosViewModel.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.photos
+package org.futo.circles.feature.photos
import androidx.lifecycle.map
-import com.futo.circles.core.rooms.RoomsViewModel
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.rooms.RoomsViewModel
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
class PhotosViewModel(
diff --git a/app/src/main/java/com/futo/circles/feature/photos/gallery/GalleryFragment.kt b/app/src/main/java/org/futo/circles/feature/photos/gallery/GalleryFragment.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/feature/photos/gallery/GalleryFragment.kt
rename to app/src/main/java/org/futo/circles/feature/photos/gallery/GalleryFragment.kt
index 1c9f534e6..678bc3652 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/gallery/GalleryFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/gallery/GalleryFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.photos.gallery
+package org.futo.circles.feature.photos.gallery
import android.annotation.SuppressLint
import android.content.Context
@@ -13,15 +13,15 @@ import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.image_picker.ImagePickerHelper
-import com.futo.circles.core.image_picker.PickGalleryImageListener
-import com.futo.circles.core.list.BaseRvDecoration
-import com.futo.circles.databinding.GalleryFragmentBinding
-import com.futo.circles.extensions.*
-import com.futo.circles.feature.photos.gallery.list.GalleryImageViewHolder
-import com.futo.circles.feature.photos.gallery.list.GalleryImagesAdapter
-import com.futo.circles.model.CircleRoomTypeArg
+import org.futo.circles.R
+import org.futo.circles.core.image_picker.ImagePickerHelper
+import org.futo.circles.core.image_picker.PickGalleryImageListener
+import org.futo.circles.core.list.BaseRvDecoration
+import org.futo.circles.databinding.GalleryFragmentBinding
+import org.futo.circles.extensions.*
+import org.futo.circles.feature.photos.gallery.list.GalleryImageViewHolder
+import org.futo.circles.feature.photos.gallery.list.GalleryImagesAdapter
+import org.futo.circles.model.CircleRoomTypeArg
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/photos/gallery/GalleryViewModel.kt b/app/src/main/java/org/futo/circles/feature/photos/gallery/GalleryViewModel.kt
similarity index 69%
rename from app/src/main/java/com/futo/circles/feature/photos/gallery/GalleryViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/photos/gallery/GalleryViewModel.kt
index 9d3bee894..785fc9f64 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/gallery/GalleryViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/gallery/GalleryViewModel.kt
@@ -1,20 +1,20 @@
-package com.futo.circles.feature.photos.gallery
+package org.futo.circles.feature.photos.gallery
import android.content.Context
import android.net.Uri
import androidx.lifecycle.map
import com.bumptech.glide.Glide
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.getUri
-import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.photos.preview.GalleryImageDataSource
-import com.futo.circles.feature.room.LeaveRoomDataSource
-import com.futo.circles.feature.timeline.BaseTimelineViewModel
-import com.futo.circles.feature.timeline.data_source.SendMessageDataSource
-import com.futo.circles.feature.timeline.data_source.TimelineDataSource
-import com.futo.circles.model.GalleryImageListItem
-import com.futo.circles.model.ImageContent
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.getUri
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.feature.photos.preview.GalleryImageDataSource
+import org.futo.circles.feature.room.LeaveRoomDataSource
+import org.futo.circles.feature.timeline.BaseTimelineViewModel
+import org.futo.circles.feature.timeline.data_source.SendMessageDataSource
+import org.futo.circles.feature.timeline.data_source.TimelineDataSource
+import org.futo.circles.model.GalleryImageListItem
+import org.futo.circles.model.ImageContent
class GalleryViewModel(
private val roomId: String,
diff --git a/app/src/main/java/com/futo/circles/feature/photos/gallery/list/GalleryImageViewHolder.kt b/app/src/main/java/org/futo/circles/feature/photos/gallery/list/GalleryImageViewHolder.kt
similarity index 65%
rename from app/src/main/java/com/futo/circles/feature/photos/gallery/list/GalleryImageViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/photos/gallery/list/GalleryImageViewHolder.kt
index 0f79518aa..41b40c077 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/gallery/list/GalleryImageViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/gallery/list/GalleryImageViewHolder.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.photos.gallery.list
+package org.futo.circles.feature.photos.gallery.list
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.GalleryImageListItemBinding
-import com.futo.circles.extensions.loadInto
-import com.futo.circles.extensions.onClick
-import com.futo.circles.model.GalleryImageListItem
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.GalleryImageListItemBinding
+import org.futo.circles.extensions.loadInto
+import org.futo.circles.extensions.onClick
+import org.futo.circles.model.GalleryImageListItem
class GalleryImageViewHolder(
parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/feature/photos/gallery/list/GalleryImagesAdapter.kt b/app/src/main/java/org/futo/circles/feature/photos/gallery/list/GalleryImagesAdapter.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/feature/photos/gallery/list/GalleryImagesAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/photos/gallery/list/GalleryImagesAdapter.kt
index 25df5a489..881319f24 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/gallery/list/GalleryImagesAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/gallery/list/GalleryImagesAdapter.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.photos.gallery.list
+package org.futo.circles.feature.photos.gallery.list
import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.GalleryImageListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.GalleryImageListItem
class GalleryImagesAdapter(
private val onGalleryImageClicked: (postId: String) -> Unit,
diff --git a/app/src/main/java/com/futo/circles/feature/photos/preview/GalleryImageDataSource.kt b/app/src/main/java/org/futo/circles/feature/photos/preview/GalleryImageDataSource.kt
similarity index 68%
rename from app/src/main/java/com/futo/circles/feature/photos/preview/GalleryImageDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/photos/preview/GalleryImageDataSource.kt
index 36f2187f5..0d9ee3cf0 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/preview/GalleryImageDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/preview/GalleryImageDataSource.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.photos.preview
+package org.futo.circles.feature.photos.preview
-import com.futo.circles.mapping.toPost
-import com.futo.circles.model.GalleryImageListItem
-import com.futo.circles.model.ImageContent
-import com.futo.circles.model.PostContentType
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.mapping.toPost
+import org.futo.circles.model.GalleryImageListItem
+import org.futo.circles.model.ImageContent
+import org.futo.circles.model.PostContentType
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.getRoom
import org.matrix.android.sdk.api.session.room.getTimelineEvent
diff --git a/app/src/main/java/com/futo/circles/feature/photos/preview/GalleryImageDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/photos/preview/GalleryImageDialogFragment.kt
similarity index 86%
rename from app/src/main/java/com/futo/circles/feature/photos/preview/GalleryImageDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/photos/preview/GalleryImageDialogFragment.kt
index 9b1cefe9c..1f66d9470 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/preview/GalleryImageDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/preview/GalleryImageDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.photos.preview
+package org.futo.circles.feature.photos.preview
import android.annotation.SuppressLint
import android.graphics.Color
@@ -7,14 +7,14 @@ import android.view.View
import android.view.WindowManager
import androidx.appcompat.view.menu.MenuBuilder
import androidx.navigation.fragment.navArgs
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.databinding.GalleryImageDialogFragmentBinding
-import com.futo.circles.extensions.loadInto
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.showDialog
-import com.futo.circles.extensions.showSuccess
-import com.futo.circles.feature.timeline.post.share.ShareProvider
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.databinding.GalleryImageDialogFragmentBinding
+import org.futo.circles.extensions.loadInto
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.showDialog
+import org.futo.circles.extensions.showSuccess
+import org.futo.circles.feature.timeline.post.share.ShareProvider
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/photos/preview/GalleryImageViewModel.kt b/app/src/main/java/org/futo/circles/feature/photos/preview/GalleryImageViewModel.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/photos/preview/GalleryImageViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/photos/preview/GalleryImageViewModel.kt
index 2a05399e1..ac262cdef 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/preview/GalleryImageViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/preview/GalleryImageViewModel.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.photos.preview
+package org.futo.circles.feature.photos.preview
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.launchBg
-import com.futo.circles.feature.timeline.post.PostOptionsDataSource
-import com.futo.circles.feature.timeline.post.share.ShareableContent
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.feature.timeline.post.PostOptionsDataSource
+import org.futo.circles.feature.timeline.post.share.ShareableContent
class GalleryImageViewModel(
private val roomId: String,
diff --git a/app/src/main/java/com/futo/circles/feature/photos/save/SaveToGalleryViewModel.kt b/app/src/main/java/org/futo/circles/feature/photos/save/SaveToGalleryViewModel.kt
similarity index 73%
rename from app/src/main/java/com/futo/circles/feature/photos/save/SaveToGalleryViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/photos/save/SaveToGalleryViewModel.kt
index 5a272bccc..92380677a 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/save/SaveToGalleryViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/save/SaveToGalleryViewModel.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.photos.save
+package org.futo.circles.feature.photos.save
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.photos.preview.GalleryImageDataSource
-import com.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.feature.photos.preview.GalleryImageDataSource
+import org.futo.circles.model.SelectableRoomListItem
class SaveToGalleryViewModel(
private val galleryImageDataSource: GalleryImageDataSource,
diff --git a/app/src/main/java/com/futo/circles/feature/photos/save/SaveToGalleyDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/photos/save/SaveToGalleyDialogFragment.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/feature/photos/save/SaveToGalleyDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/photos/save/SaveToGalleyDialogFragment.kt
index 5052e9077..4b36ae83d 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/save/SaveToGalleyDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/save/SaveToGalleyDialogFragment.kt
@@ -1,18 +1,18 @@
-package com.futo.circles.feature.photos.save
+package org.futo.circles.feature.photos.save
import android.os.Bundle
import android.view.View
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.navArgs
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.databinding.SaveToGalleryDialogFragmentBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showSuccess
-import com.futo.circles.feature.photos.save.list.SelectGalleryAdapter
-import com.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.SaveToGalleryDialogFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showSuccess
+import org.futo.circles.feature.photos.save.list.SelectGalleryAdapter
+import org.futo.circles.model.SelectableRoomListItem
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/photos/save/SelectGalleryDataSource.kt b/app/src/main/java/org/futo/circles/feature/photos/save/SelectGalleryDataSource.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/photos/save/SelectGalleryDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/photos/save/SelectGalleryDataSource.kt
index 46da5dd82..d803a4b49 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/save/SelectGalleryDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/save/SelectGalleryDataSource.kt
@@ -1,16 +1,16 @@
-package com.futo.circles.feature.photos.save
+package org.futo.circles.feature.photos.save
import android.content.Context
import androidx.lifecycle.MutableLiveData
import com.bumptech.glide.Glide
-import com.futo.circles.extensions.getUri
-import com.futo.circles.extensions.onBG
-import com.futo.circles.feature.timeline.data_source.SendMessageDataSource
-import com.futo.circles.mapping.toSelectableRoomListItem
-import com.futo.circles.model.GALLERY_TYPE
-import com.futo.circles.model.ImageContent
-import com.futo.circles.model.SelectableRoomListItem
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.extensions.getUri
+import org.futo.circles.extensions.onBG
+import org.futo.circles.feature.timeline.data_source.SendMessageDataSource
+import org.futo.circles.mapping.toSelectableRoomListItem
+import org.futo.circles.model.GALLERY_TYPE
+import org.futo.circles.model.ImageContent
+import org.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.room.model.Membership
import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
diff --git a/app/src/main/java/com/futo/circles/feature/photos/save/list/SelectGalleryAdapter.kt b/app/src/main/java/org/futo/circles/feature/photos/save/list/SelectGalleryAdapter.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/photos/save/list/SelectGalleryAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/photos/save/list/SelectGalleryAdapter.kt
index 006487a74..3f6e4f98f 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/save/list/SelectGalleryAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/save/list/SelectGalleryAdapter.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.photos.save.list
+package org.futo.circles.feature.photos.save.list
import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.SelectableRoomListItem
class SelectGalleryAdapter(
private val onGalleryClicked: (SelectableRoomListItem) -> Unit,
diff --git a/app/src/main/java/com/futo/circles/feature/photos/save/list/SelectGalleryViewHolder.kt b/app/src/main/java/org/futo/circles/feature/photos/save/list/SelectGalleryViewHolder.kt
similarity index 69%
rename from app/src/main/java/com/futo/circles/feature/photos/save/list/SelectGalleryViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/photos/save/list/SelectGalleryViewHolder.kt
index e86687dfc..a13f0952a 100644
--- a/app/src/main/java/com/futo/circles/feature/photos/save/list/SelectGalleryViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/photos/save/list/SelectGalleryViewHolder.kt
@@ -1,14 +1,14 @@
-package com.futo.circles.feature.photos.save.list
+package org.futo.circles.feature.photos.save.list
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.R
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.SelectGalleryListItemBinding
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.extensions.onClick
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.model.SelectableRoomListItem
+import org.futo.circles.R
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.SelectGalleryListItemBinding
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.extensions.onClick
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.model.SelectableRoomListItem
class SelectGalleryViewHolder(
parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/feature/room/LeaveRoomDataSource.kt b/app/src/main/java/org/futo/circles/feature/room/LeaveRoomDataSource.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/room/LeaveRoomDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/room/LeaveRoomDataSource.kt
index 5f122a7ef..9f6691469 100644
--- a/app/src/main/java/com/futo/circles/feature/room/LeaveRoomDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/LeaveRoomDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.room
+package org.futo.circles.feature.room
-import com.futo.circles.core.matrix.room.RoomRelationsBuilder
-import com.futo.circles.extensions.createResult
-import com.futo.circles.extensions.getCurrentUserPowerLevel
-import com.futo.circles.extensions.getRoomOwners
-import com.futo.circles.extensions.getTimelineRoomFor
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.matrix.room.RoomRelationsBuilder
+import org.futo.circles.extensions.createResult
+import org.futo.circles.extensions.getCurrentUserPowerLevel
+import org.futo.circles.extensions.getRoomOwners
+import org.futo.circles.extensions.getTimelineRoomFor
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.getRoom
import org.matrix.android.sdk.api.session.room.powerlevels.Role
diff --git a/app/src/main/java/com/futo/circles/feature/room/create_room/CreateRoomDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/room/create_room/CreateRoomDialogFragment.kt
similarity index 84%
rename from app/src/main/java/com/futo/circles/feature/room/create_room/CreateRoomDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/room/create_room/CreateRoomDialogFragment.kt
index 325ffae9b..8d11acbda 100644
--- a/app/src/main/java/com/futo/circles/feature/room/create_room/CreateRoomDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/create_room/CreateRoomDialogFragment.kt
@@ -1,21 +1,21 @@
-package com.futo.circles.feature.room.create_room
+package org.futo.circles.feature.room.create_room
import android.os.Bundle
import android.view.View
import androidx.core.widget.doAfterTextChanged
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.navArgs
-import com.futo.circles.R
-import com.futo.circles.core.image_picker.ImagePickerHelper
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.databinding.CreateRoomDialogFragmentBinding
-import com.futo.circles.extensions.getText
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.feature.room.select_users.SelectUsersFragment
-import com.futo.circles.model.CircleRoomTypeArg
+import org.futo.circles.R
+import org.futo.circles.core.image_picker.ImagePickerHelper
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.CreateRoomDialogFragmentBinding
+import org.futo.circles.extensions.getText
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.feature.room.select_users.SelectUsersFragment
+import org.futo.circles.model.CircleRoomTypeArg
import org.koin.androidx.viewmodel.ext.android.viewModel
class CreateRoomDialogFragment :
diff --git a/app/src/main/java/com/futo/circles/feature/room/create_room/CreateRoomViewModel.kt b/app/src/main/java/org/futo/circles/feature/room/create_room/CreateRoomViewModel.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/feature/room/create_room/CreateRoomViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/room/create_room/CreateRoomViewModel.kt
index d11426f20..a7efa8f95 100644
--- a/app/src/main/java/com/futo/circles/feature/room/create_room/CreateRoomViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/create_room/CreateRoomViewModel.kt
@@ -1,17 +1,17 @@
-package com.futo.circles.feature.room.create_room
+package org.futo.circles.feature.room.create_room
import android.net.Uri
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-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.model.CircleRoomTypeArg
-import com.futo.circles.model.Gallery
-import com.futo.circles.model.Group
-import com.futo.circles.model.UserListItem
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.core.matrix.room.CreateRoomDataSource
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.model.CircleRoomTypeArg
+import org.futo.circles.model.Gallery
+import org.futo.circles.model.Group
+import org.futo.circles.model.UserListItem
class CreateRoomViewModel(
private val dataSource: CreateRoomDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersDataSource.kt b/app/src/main/java/org/futo/circles/feature/room/invite/InviteMembersDataSource.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/room/invite/InviteMembersDataSource.kt
index b80bf2fd8..9905f406c 100644
--- a/app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/invite/InviteMembersDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.room.invite
+package org.futo.circles.feature.room.invite
import android.content.Context
-import com.futo.circles.R
-import com.futo.circles.extensions.createResult
-import com.futo.circles.mapping.nameOrId
-import com.futo.circles.model.UserListItem
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.extensions.createResult
+import org.futo.circles.mapping.nameOrId
+import org.futo.circles.model.UserListItem
+import org.futo.circles.provider.MatrixSessionProvider
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
diff --git a/app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/room/invite/InviteMembersDialogFragment.kt
similarity index 77%
rename from app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/room/invite/InviteMembersDialogFragment.kt
index 66d4b72be..c345f3ecc 100644
--- a/app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/invite/InviteMembersDialogFragment.kt
@@ -1,19 +1,19 @@
-package com.futo.circles.feature.room.invite
+package org.futo.circles.feature.room.invite
import android.os.Bundle
import android.view.View
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.navArgs
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-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.room.select_users.SelectUsersFragment
-import com.futo.circles.feature.room.select_users.SelectUsersListener
-import com.futo.circles.model.UserListItem
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.InviteMembersDialogFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showSuccess
+import org.futo.circles.feature.room.select_users.SelectUsersFragment
+import org.futo.circles.feature.room.select_users.SelectUsersListener
+import org.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/room/invite/InviteMembersViewModel.kt b/app/src/main/java/org/futo/circles/feature/room/invite/InviteMembersViewModel.kt
similarity index 67%
rename from app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/room/invite/InviteMembersViewModel.kt
index 4bac3ca84..da7157876 100644
--- a/app/src/main/java/com/futo/circles/feature/room/invite/InviteMembersViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/invite/InviteMembersViewModel.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.room.invite
+package org.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.model.UserListItem
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.model.UserListItem
class InviteMembersViewModel(
private val dataSource: InviteMembersDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersDataSource.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersDataSource.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersDataSource.kt
index cd0d97c98..a84723947 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersDataSource.kt
@@ -1,16 +1,16 @@
-package com.futo.circles.feature.room.manage_members
+package org.futo.circles.feature.room.manage_members
import android.content.Context
import androidx.lifecycle.asFlow
-import com.futo.circles.R
-import com.futo.circles.core.ExpandableItemsDataSource
-import com.futo.circles.extensions.createResult
-import com.futo.circles.mapping.nameOrId
-import com.futo.circles.mapping.toGroupMemberListItem
-import com.futo.circles.mapping.toInvitedUserListItem
-import com.futo.circles.model.*
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.core.ExpandableItemsDataSource
+import org.futo.circles.extensions.createResult
+import org.futo.circles.mapping.nameOrId
+import org.futo.circles.mapping.toGroupMemberListItem
+import org.futo.circles.mapping.toInvitedUserListItem
+import org.futo.circles.model.*
+import org.futo.circles.provider.MatrixSessionProvider
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.*
import org.matrix.android.sdk.api.query.QueryStringValue
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersDialogFragment.kt
similarity index 89%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersDialogFragment.kt
index 8f910af9b..3b15bf705 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.room.manage_members
+package org.futo.circles.feature.room.manage_members
import android.os.Bundle
@@ -6,13 +6,13 @@ import android.view.View
import androidx.navigation.fragment.findNavController
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.ManageMembersDialogFragmentBinding
-import com.futo.circles.extensions.*
-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.futo.circles.R
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.databinding.ManageMembersDialogFragmentBinding
+import org.futo.circles.extensions.*
+import org.futo.circles.feature.room.manage_members.change_role.ChangeAccessLevelListener
+import org.futo.circles.feature.room.manage_members.list.GroupMembersListAdapter
+import org.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
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersViewModel.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersViewModel.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersViewModel.kt
index ab65f9cff..046faf280 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/ManageMembersViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/ManageMembersViewModel.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.room.manage_members
+package org.futo.circles.feature.room.manage_members
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.asLiveData
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
class ManageMembersViewModel(
private val dataSource: ManageMembersDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelBottomSheet.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelBottomSheet.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelBottomSheet.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelBottomSheet.kt
index 369cd6cc6..22f137fc8 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelBottomSheet.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelBottomSheet.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.room.manage_members.change_role
+package org.futo.circles.feature.room.manage_members.change_role
import android.content.Context
import android.os.Bundle
@@ -8,10 +8,10 @@ import android.view.ViewGroup
import android.view.WindowManager
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.room.manage_members.change_role.list.ChangeAccessLevelAdapter
-import com.futo.circles.model.AccessLevelListItem
+import org.futo.circles.databinding.ChangeAccessLevelBottomSheetBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.feature.room.manage_members.change_role.list.ChangeAccessLevelAdapter
+import org.futo.circles.model.AccessLevelListItem
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
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/room/manage_members/change_role/ChangeAccessLevelDataSource.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelDataSource.kt
similarity index 76%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelDataSource.kt
index a03071795..7050a8482 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelDataSource.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.feature.room.manage_members.change_role
+package org.futo.circles.feature.room.manage_members.change_role
-import com.futo.circles.model.AccessLevel
-import com.futo.circles.model.AccessLevelListItem
+import org.futo.circles.model.AccessLevel
+import org.futo.circles.model.AccessLevelListItem
import org.matrix.android.sdk.api.session.room.powerlevels.Role
class ChangeAccessLevelDataSource(
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelListener.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelListener.kt
similarity index 61%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelListener.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelListener.kt
index fc1d35bc0..9f2c01515 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelListener.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelListener.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.room.manage_members.change_role
+package org.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/room/manage_members/change_role/ChangeAccessLevelViewModel.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelViewModel.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelViewModel.kt
index 480e03703..677e5d979 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/ChangeAccessLevelViewModel.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.room.manage_members.change_role
+package org.futo.circles.feature.room.manage_members.change_role
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/list/AccessLevelViewHolder.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/list/AccessLevelViewHolder.kt
similarity index 67%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/list/AccessLevelViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/list/AccessLevelViewHolder.kt
index ac3f381e1..65c6a2269 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/list/AccessLevelViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/list/AccessLevelViewHolder.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.room.manage_members.change_role.list
+package org.futo.circles.feature.room.manage_members.change_role.list
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.AccessLevelListItemBinding
-import com.futo.circles.extensions.getRoleNameResId
-import com.futo.circles.extensions.onClick
-import com.futo.circles.model.AccessLevelListItem
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.AccessLevelListItemBinding
+import org.futo.circles.extensions.getRoleNameResId
+import org.futo.circles.extensions.onClick
+import org.futo.circles.model.AccessLevelListItem
class AccessLevelViewHolder(
parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/list/ChangeAccessLevelAdapter.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/list/ChangeAccessLevelAdapter.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/list/ChangeAccessLevelAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/list/ChangeAccessLevelAdapter.kt
index afebc0001..f3156e398 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/change_role/list/ChangeAccessLevelAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/change_role/list/ChangeAccessLevelAdapter.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.room.manage_members.change_role.list
+package org.futo.circles.feature.room.manage_members.change_role.list
import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.AccessLevelListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.AccessLevelListItem
class ChangeAccessLevelAdapter(
private val onLevelClicked: (AccessLevelListItem) -> Unit
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt
index 8dc8a7e82..4865fdb3f 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/list/MemberViewHolder.kt
@@ -1,20 +1,20 @@
-package com.futo.circles.feature.room.manage_members.list
+package org.futo.circles.feature.room.manage_members.list
import android.view.View
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.R
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.core.list.context
-import com.futo.circles.databinding.InviteHeaderListItemBinding
-import com.futo.circles.databinding.InvitedUserListItemBinding
-import com.futo.circles.databinding.MemberListItemBinding
-import com.futo.circles.extensions.*
-import com.futo.circles.model.GroupMemberListItem
-import com.futo.circles.model.InvitedUserListItem
-import com.futo.circles.model.ManageMembersHeaderListItem
-import com.futo.circles.model.ManageMembersListItem
-import com.futo.circles.view.ManageMembersOptionsListener
+import org.futo.circles.R
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.core.list.context
+import org.futo.circles.databinding.InviteHeaderListItemBinding
+import org.futo.circles.databinding.InvitedUserListItemBinding
+import org.futo.circles.databinding.MemberListItemBinding
+import org.futo.circles.extensions.*
+import org.futo.circles.model.GroupMemberListItem
+import org.futo.circles.model.InvitedUserListItem
+import org.futo.circles.model.ManageMembersHeaderListItem
+import org.futo.circles.model.ManageMembersListItem
+import org.futo.circles.view.ManageMembersOptionsListener
abstract class ManageMembersViewHolder(view: View) : RecyclerView.ViewHolder(view) {
abstract fun bind(data: ManageMembersListItem)
diff --git a/app/src/main/java/com/futo/circles/feature/room/manage_members/list/MembersListAdapter.kt b/app/src/main/java/org/futo/circles/feature/room/manage_members/list/MembersListAdapter.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/room/manage_members/list/MembersListAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/room/manage_members/list/MembersListAdapter.kt
index 29d44eb01..16c845a99 100644
--- a/app/src/main/java/com/futo/circles/feature/room/manage_members/list/MembersListAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/manage_members/list/MembersListAdapter.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.room.manage_members.list
+package org.futo.circles.feature.room.manage_members.list
import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.GroupMemberListItem
-import com.futo.circles.model.InvitedUserListItem
-import com.futo.circles.model.ManageMembersHeaderListItem
-import com.futo.circles.model.ManageMembersListItem
-import com.futo.circles.view.ManageMembersOptionsListener
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.GroupMemberListItem
+import org.futo.circles.model.InvitedUserListItem
+import org.futo.circles.model.ManageMembersHeaderListItem
+import org.futo.circles.model.ManageMembersListItem
+import org.futo.circles.view.ManageMembersOptionsListener
private enum class ManageGroupMembersViewTypes { Header, Member, Invited }
diff --git a/app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersDataSource.kt b/app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersDataSource.kt
similarity index 89%
rename from app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersDataSource.kt
index c0648e627..11d9cb43b 100644
--- a/app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersDataSource.kt
@@ -1,13 +1,13 @@
-package com.futo.circles.feature.room.select_users
+package org.futo.circles.feature.room.select_users
import androidx.lifecycle.asFlow
-import com.futo.circles.core.DEFAULT_USER_PREFIX
-import com.futo.circles.mapping.toUserListItem
-import com.futo.circles.model.HeaderItem
-import com.futo.circles.model.InviteMemberListItem
-import com.futo.circles.model.NoResultsItem
-import com.futo.circles.model.UserListItem
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.DEFAULT_USER_PREFIX
+import org.futo.circles.mapping.toUserListItem
+import org.futo.circles.model.HeaderItem
+import org.futo.circles.model.InviteMemberListItem
+import org.futo.circles.model.NoResultsItem
+import org.futo.circles.model.UserListItem
+import org.futo.circles.provider.MatrixSessionProvider
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.*
import org.matrix.android.sdk.api.session.getRoom
diff --git a/app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersFragment.kt b/app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersFragment.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersFragment.kt
rename to app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersFragment.kt
index 1d103c56c..28ee80d8c 100644
--- a/app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.room.select_users
+package org.futo.circles.feature.room.select_users
import android.content.Context
import android.os.Bundle
@@ -6,14 +6,14 @@ import android.view.View
import androidx.core.os.bundleOf
import androidx.fragment.app.Fragment
import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-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.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.futo.circles.R
+import org.futo.circles.databinding.SelectUsersFragmentBinding
+import org.futo.circles.extensions.getQueryTextChangeStateFlow
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.feature.room.select_users.list.search.InviteMembersSearchListAdapter
+import org.futo.circles.feature.room.select_users.list.selected.SelectedUsersListAdapter
+import org.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/room/select_users/SelectUsersViewModel.kt b/app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersViewModel.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersViewModel.kt
index 896660448..5be116646 100644
--- a/app/src/main/java/com/futo/circles/feature/room/select_users/SelectUsersViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/select_users/SelectUsersViewModel.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.room.select_users
+package org.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.model.InviteMemberListItem
-import com.futo.circles.model.UserListItem
+import org.futo.circles.extensions.launchUi
+import org.futo.circles.model.InviteMemberListItem
+import org.futo.circles.model.UserListItem
import kotlinx.coroutines.flow.*
class SelectUsersViewModel(
diff --git a/app/src/main/java/com/futo/circles/feature/room/select_users/list/search/InviteMemberViewHolder.kt b/app/src/main/java/org/futo/circles/feature/room/select_users/list/search/InviteMemberViewHolder.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/feature/room/select_users/list/search/InviteMemberViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/room/select_users/list/search/InviteMemberViewHolder.kt
index 7eeebbf41..f426bc199 100644
--- a/app/src/main/java/com/futo/circles/feature/room/select_users/list/search/InviteMemberViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/select_users/list/search/InviteMemberViewHolder.kt
@@ -1,21 +1,21 @@
-package com.futo.circles.feature.room.select_users.list.search
+package org.futo.circles.feature.room.select_users.list.search
import android.view.View
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.R
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.core.list.context
-import com.futo.circles.databinding.InviteHeaderListItemBinding
-import com.futo.circles.databinding.NoResultsListItemBinding
-import com.futo.circles.databinding.UserListItemBinding
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.extensions.onClick
-import com.futo.circles.extensions.setSelectableItemBackground
-import com.futo.circles.model.UserListItem
-import com.futo.circles.model.HeaderItem
-import com.futo.circles.model.InviteMemberListItem
-import com.futo.circles.model.NoResultsItem
+import org.futo.circles.R
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.core.list.context
+import org.futo.circles.databinding.InviteHeaderListItemBinding
+import org.futo.circles.databinding.NoResultsListItemBinding
+import org.futo.circles.databinding.UserListItemBinding
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.extensions.onClick
+import org.futo.circles.extensions.setSelectableItemBackground
+import org.futo.circles.model.UserListItem
+import org.futo.circles.model.HeaderItem
+import org.futo.circles.model.InviteMemberListItem
+import org.futo.circles.model.NoResultsItem
abstract class InviteMemberViewHolder(view: View) : RecyclerView.ViewHolder(view) {
abstract fun bind(data: InviteMemberListItem)
diff --git a/app/src/main/java/com/futo/circles/feature/room/select_users/list/search/InviteMembersSearchListAdapter.kt b/app/src/main/java/org/futo/circles/feature/room/select_users/list/search/InviteMembersSearchListAdapter.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/room/select_users/list/search/InviteMembersSearchListAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/room/select_users/list/search/InviteMembersSearchListAdapter.kt
index 3f0b2e828..4dfc4bc8c 100644
--- a/app/src/main/java/com/futo/circles/feature/room/select_users/list/search/InviteMembersSearchListAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/select_users/list/search/InviteMembersSearchListAdapter.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.room.select_users.list.search
+package org.futo.circles.feature.room.select_users.list.search
import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.HeaderItem
-import com.futo.circles.model.InviteMemberListItem
-import com.futo.circles.model.NoResultsItem
-import com.futo.circles.model.UserListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.HeaderItem
+import org.futo.circles.model.InviteMemberListItem
+import org.futo.circles.model.NoResultsItem
+import org.futo.circles.model.UserListItem
private enum class InviteListViewType { Header, User, NoResults }
diff --git a/app/src/main/java/com/futo/circles/feature/room/select_users/list/selected/SelectedUsersListAdapter.kt b/app/src/main/java/org/futo/circles/feature/room/select_users/list/selected/SelectedUsersListAdapter.kt
similarity index 74%
rename from app/src/main/java/com/futo/circles/feature/room/select_users/list/selected/SelectedUsersListAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/room/select_users/list/selected/SelectedUsersListAdapter.kt
index 73ca99820..e024829bf 100644
--- a/app/src/main/java/com/futo/circles/feature/room/select_users/list/selected/SelectedUsersListAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/select_users/list/selected/SelectedUsersListAdapter.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.room.select_users.list.selected
+package org.futo.circles.feature.room.select_users.list.selected
import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.core.list.ChipItemViewHolder
-import com.futo.circles.model.UserListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.core.list.ChipItemViewHolder
+import org.futo.circles.model.UserListItem
class SelectedUsersListAdapter(
private val onUserDeselected: (UserListItem) -> Unit
diff --git a/app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomDataSource.kt b/app/src/main/java/org/futo/circles/feature/room/update_room/UpdateRoomDataSource.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/room/update_room/UpdateRoomDataSource.kt
index b255c2b51..41b30dbfb 100644
--- a/app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/update_room/UpdateRoomDataSource.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.room.update_room
+package org.futo.circles.feature.room.update_room
import android.content.Context
import android.net.Uri
-import com.futo.circles.extensions.createResult
-import com.futo.circles.extensions.getFilename
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.extensions.createResult
+import org.futo.circles.extensions.getFilename
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.getRoom
import java.util.*
diff --git a/app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/room/update_room/UpdateRoomDialogFragment.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/room/update_room/UpdateRoomDialogFragment.kt
index 3f3fe0c93..7a2c975f3 100644
--- a/app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/update_room/UpdateRoomDialogFragment.kt
@@ -1,17 +1,17 @@
-package com.futo.circles.feature.room.update_room
+package org.futo.circles.feature.room.update_room
import android.os.Bundle
import android.view.View
import androidx.core.widget.doAfterTextChanged
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.navArgs
-import com.futo.circles.R
-import com.futo.circles.core.image_picker.ImagePickerHelper
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.databinding.UpdateRoomDialogFragmentBinding
-import com.futo.circles.extensions.*
-import com.futo.circles.model.CircleRoomTypeArg
+import org.futo.circles.R
+import org.futo.circles.core.image_picker.ImagePickerHelper
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.UpdateRoomDialogFragmentBinding
+import org.futo.circles.extensions.*
+import org.futo.circles.model.CircleRoomTypeArg
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf
import org.matrix.android.sdk.api.session.room.model.RoomSummary
diff --git a/app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomViewModel.kt b/app/src/main/java/org/futo/circles/feature/room/update_room/UpdateRoomViewModel.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/room/update_room/UpdateRoomViewModel.kt
index 3f5421672..13c5f60ce 100644
--- a/app/src/main/java/com/futo/circles/feature/room/update_room/UpdateRoomViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/room/update_room/UpdateRoomViewModel.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.room.update_room
+package org.futo.circles.feature.room.update_room
import android.net.Uri
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 org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
class UpdateRoomViewModel(
private val dataSource: UpdateRoomDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/settings/SettingsDataSource.kt b/app/src/main/java/org/futo/circles/feature/settings/SettingsDataSource.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/settings/SettingsDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/settings/SettingsDataSource.kt
index 763406fea..cdd7ce95f 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/SettingsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/SettingsDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.settings
+package org.futo.circles.feature.settings
import android.content.Context
import androidx.lifecycle.MutableLiveData
-import com.futo.circles.R
-import com.futo.circles.extensions.createResult
-import com.futo.circles.model.LoadingData
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.extensions.createResult
+import org.futo.circles.model.LoadingData
+import org.futo.circles.provider.MatrixSessionProvider
class SettingsDataSource(context: Context) {
diff --git a/app/src/main/java/com/futo/circles/feature/settings/SettingsFragment.kt b/app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/feature/settings/SettingsFragment.kt
rename to app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt
index a8bd8ff3b..bf2d8d2d7 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt
@@ -1,18 +1,18 @@
-package com.futo.circles.feature.settings
+package org.futo.circles.feature.settings
import android.os.Bundle
import android.view.View
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.matrix.pass_phrase.LoadingDialog
-import com.futo.circles.databinding.SettingsFragmentBinding
-import com.futo.circles.extensions.findParentNavController
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showDialog
-import com.futo.circles.feature.bottom_navigation.BottomNavigationFragmentDirections
+import org.futo.circles.R
+import org.futo.circles.core.matrix.pass_phrase.LoadingDialog
+import org.futo.circles.databinding.SettingsFragmentBinding
+import org.futo.circles.extensions.findParentNavController
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showDialog
+import org.futo.circles.feature.bottom_navigation.BottomNavigationFragmentDirections
import org.koin.androidx.viewmodel.ext.android.viewModel
class SettingsFragment : Fragment(R.layout.settings_fragment) {
diff --git a/app/src/main/java/com/futo/circles/feature/settings/SettingsViewModel.kt b/app/src/main/java/org/futo/circles/feature/settings/SettingsViewModel.kt
similarity index 68%
rename from app/src/main/java/com/futo/circles/feature/settings/SettingsViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/settings/SettingsViewModel.kt
index 0a42ae1c3..c65914811 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/SettingsViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/SettingsViewModel.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.settings
+package org.futo.circles.feature.settings
import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
class SettingsViewModel(
private val dataSource: SettingsDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/ActiveSessionsDataSource.kt b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/ActiveSessionsDataSource.kt
similarity index 88%
rename from app/src/main/java/com/futo/circles/feature/settings/active_sessions/ActiveSessionsDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/settings/active_sessions/ActiveSessionsDataSource.kt
index a583a0ae3..328618597 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/ActiveSessionsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/ActiveSessionsDataSource.kt
@@ -1,13 +1,13 @@
-package com.futo.circles.feature.settings.active_sessions
+package org.futo.circles.feature.settings.active_sessions
import android.content.Context
import androidx.lifecycle.asFlow
-import com.futo.circles.R
-import com.futo.circles.core.ExpandableItemsDataSource
-import com.futo.circles.model.ActiveSession
-import com.futo.circles.model.ActiveSessionListItem
-import com.futo.circles.model.SessionHeader
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.core.ExpandableItemsDataSource
+import org.futo.circles.model.ActiveSession
+import org.futo.circles.model.ActiveSessionListItem
+import org.futo.circles.model.SessionHeader
+import org.futo.circles.provider.MatrixSessionProvider
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.*
import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
diff --git a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/ActiveSessionsDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/ActiveSessionsDialogFragment.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/feature/settings/active_sessions/ActiveSessionsDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/settings/active_sessions/ActiveSessionsDialogFragment.kt
index dd48559c3..2b3c4442e 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/ActiveSessionsDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/ActiveSessionsDialogFragment.kt
@@ -1,14 +1,14 @@
-package com.futo.circles.feature.settings.active_sessions
+package org.futo.circles.feature.settings.active_sessions
import android.os.Bundle
import android.view.View
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.DividerItemDecoration
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.databinding.ActiveSessionsDialogFragmentBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.feature.settings.active_sessions.list.ActiveSessionClickListener
-import com.futo.circles.feature.settings.active_sessions.list.ActiveSessionsAdapter
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.databinding.ActiveSessionsDialogFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.feature.settings.active_sessions.list.ActiveSessionClickListener
+import org.futo.circles.feature.settings.active_sessions.list.ActiveSessionsAdapter
import org.koin.androidx.viewmodel.ext.android.viewModel
class ActiveSessionsDialogFragment :
diff --git a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/ActiveSessionsViewModel.kt b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/ActiveSessionsViewModel.kt
similarity index 88%
rename from app/src/main/java/com/futo/circles/feature/settings/active_sessions/ActiveSessionsViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/settings/active_sessions/ActiveSessionsViewModel.kt
index 1a12d0a61..7d4cd836a 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/ActiveSessionsViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/ActiveSessionsViewModel.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.settings.active_sessions
+package org.futo.circles.feature.settings.active_sessions
import androidx.lifecycle.ViewModel
import androidx.lifecycle.asLiveData
diff --git a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/list/ActiveSessionsAdapter.kt b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/list/ActiveSessionsAdapter.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/feature/settings/active_sessions/list/ActiveSessionsAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/settings/active_sessions/list/ActiveSessionsAdapter.kt
index 6d131b2fd..76b8a8b65 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/list/ActiveSessionsAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/list/ActiveSessionsAdapter.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.settings.active_sessions.list
+package org.futo.circles.feature.settings.active_sessions.list
import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.ActiveSession
-import com.futo.circles.model.ActiveSessionListItem
-import com.futo.circles.model.SessionHeader
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.ActiveSession
+import org.futo.circles.model.ActiveSessionListItem
+import org.futo.circles.model.SessionHeader
interface ActiveSessionClickListener {
fun onItemClicked(deviceId: String)
diff --git a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/list/ActiveSessionsViewHolder.kt b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/list/ActiveSessionsViewHolder.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/settings/active_sessions/list/ActiveSessionsViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/settings/active_sessions/list/ActiveSessionsViewHolder.kt
index 1a74d42f8..9312b7531 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/list/ActiveSessionsViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/list/ActiveSessionsViewHolder.kt
@@ -1,16 +1,16 @@
-package com.futo.circles.feature.settings.active_sessions.list
+package org.futo.circles.feature.settings.active_sessions.list
import android.view.View
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.R
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.ActiveSessionListItemBinding
-import com.futo.circles.databinding.InviteHeaderListItemBinding
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.model.ActiveSession
-import com.futo.circles.model.ActiveSessionListItem
-import com.futo.circles.model.SessionHeader
+import org.futo.circles.R
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.ActiveSessionListItemBinding
+import org.futo.circles.databinding.InviteHeaderListItemBinding
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.model.ActiveSession
+import org.futo.circles.model.ActiveSessionListItem
+import org.futo.circles.model.SessionHeader
abstract class ActiveSessionsViewHolder(view: View) : RecyclerView.ViewHolder(view) {
abstract fun bind(data: ActiveSessionListItem)
diff --git a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDataSource.kt b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDataSource.kt
similarity index 69%
rename from app/src/main/java/com/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDataSource.kt
index 90829e93e..f7007dbd6 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.settings.active_sessions.remove_session
+package org.futo.circles.feature.settings.active_sessions.remove_session
import android.content.Context
-import com.futo.circles.R
-import com.futo.circles.core.matrix.auth.AuthConfirmationProvider
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.createResult
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.core.matrix.auth.AuthConfirmationProvider
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.util.awaitCallback
diff --git a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDialogFragment.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDialogFragment.kt
index 2b9d14cf8..e3c5f7188 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionDialogFragment.kt
@@ -1,17 +1,17 @@
-package com.futo.circles.feature.settings.active_sessions.remove_session
+package org.futo.circles.feature.settings.active_sessions.remove_session
import android.os.Bundle
import android.view.View
import androidx.core.widget.doAfterTextChanged
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.navArgs
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.databinding.RemoveSessionDialogFragmentBinding
-import com.futo.circles.extensions.getText
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showError
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.RemoveSessionDialogFragmentBinding
+import org.futo.circles.extensions.getText
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showError
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/settings/active_sessions/remove_session/RemoveSessionViewModel.kt b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionViewModel.kt
similarity index 68%
rename from app/src/main/java/com/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionViewModel.kt
index 4df5445a0..535520715 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/active_sessions/remove_session/RemoveSessionViewModel.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.settings.active_sessions.remove_session
+package org.futo.circles.feature.settings.active_sessions.remove_session
import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
class RemoveSessionViewModel(
private val dataSource: RemoveSessionDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/settings/change_password/ChangePasswordDataSource.kt b/app/src/main/java/org/futo/circles/feature/settings/change_password/ChangePasswordDataSource.kt
similarity index 61%
rename from app/src/main/java/com/futo/circles/feature/settings/change_password/ChangePasswordDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/settings/change_password/ChangePasswordDataSource.kt
index 37ac507f9..c7b0c78f8 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/change_password/ChangePasswordDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/change_password/ChangePasswordDataSource.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.feature.settings.change_password
+package org.futo.circles.feature.settings.change_password
-import com.futo.circles.extensions.createResult
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.extensions.createResult
+import org.futo.circles.provider.MatrixSessionProvider
class ChangePasswordDataSource {
diff --git a/app/src/main/java/com/futo/circles/feature/settings/change_password/ChangePasswordDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/settings/change_password/ChangePasswordDialogFragment.kt
similarity index 86%
rename from app/src/main/java/com/futo/circles/feature/settings/change_password/ChangePasswordDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/settings/change_password/ChangePasswordDialogFragment.kt
index 9abf34179..bb09b3121 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/change_password/ChangePasswordDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/change_password/ChangePasswordDialogFragment.kt
@@ -1,15 +1,15 @@
-package com.futo.circles.feature.settings.change_password
+package org.futo.circles.feature.settings.change_password
import android.os.Bundle
import android.view.View
import androidx.core.widget.doAfterTextChanged
import androidx.fragment.app.Fragment
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.core.matrix.pass_phrase.LoadingDialog
-import com.futo.circles.databinding.ChangePasswordDialogFragmentBinding
-import com.futo.circles.extensions.*
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.core.matrix.pass_phrase.LoadingDialog
+import org.futo.circles.databinding.ChangePasswordDialogFragmentBinding
+import org.futo.circles.extensions.*
import org.koin.androidx.viewmodel.ext.android.viewModel
class ChangePasswordDialogFragment :
diff --git a/app/src/main/java/com/futo/circles/feature/settings/change_password/ChangePasswordViewModel.kt b/app/src/main/java/org/futo/circles/feature/settings/change_password/ChangePasswordViewModel.kt
similarity index 77%
rename from app/src/main/java/com/futo/circles/feature/settings/change_password/ChangePasswordViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/settings/change_password/ChangePasswordViewModel.kt
index c0be9893c..fdc2c7a27 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/change_password/ChangePasswordViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/change_password/ChangePasswordViewModel.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.settings.change_password
+package org.futo.circles.feature.settings.change_password
import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.core.matrix.pass_phrase.create.CreatePassPhraseDataSource
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.createResult
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.core.matrix.pass_phrase.create.CreatePassPhraseDataSource
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.extensions.launchBg
class ChangePasswordViewModel(
private val changePasswordDataSource: ChangePasswordDataSource,
diff --git a/app/src/main/java/com/futo/circles/feature/settings/deactivate/DeactivateAccountDataSource.kt b/app/src/main/java/org/futo/circles/feature/settings/deactivate/DeactivateAccountDataSource.kt
similarity index 65%
rename from app/src/main/java/com/futo/circles/feature/settings/deactivate/DeactivateAccountDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/settings/deactivate/DeactivateAccountDataSource.kt
index ad8fe9e92..9531c2f22 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/deactivate/DeactivateAccountDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/deactivate/DeactivateAccountDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.settings.deactivate
+package org.futo.circles.feature.settings.deactivate
import android.content.Context
-import com.futo.circles.R
-import com.futo.circles.core.matrix.auth.AuthConfirmationProvider
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.createResult
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.core.matrix.auth.AuthConfirmationProvider
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.provider.MatrixSessionProvider
class DeactivateAccountDataSource(
context: Context,
diff --git a/app/src/main/java/com/futo/circles/feature/settings/deactivate/DeactivateAccountDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/settings/deactivate/DeactivateAccountDialogFragment.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/feature/settings/deactivate/DeactivateAccountDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/settings/deactivate/DeactivateAccountDialogFragment.kt
index c23870cf2..b3397e321 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/deactivate/DeactivateAccountDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/deactivate/DeactivateAccountDialogFragment.kt
@@ -1,18 +1,18 @@
-package com.futo.circles.feature.settings.deactivate
+package org.futo.circles.feature.settings.deactivate
import android.os.Bundle
import android.view.View
import androidx.core.widget.doAfterTextChanged
import androidx.fragment.app.Fragment
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.databinding.DeactivateAccountDialogFragmentBinding
-import com.futo.circles.extensions.findParentNavController
-import com.futo.circles.extensions.getText
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showError
-import com.futo.circles.feature.bottom_navigation.BottomNavigationFragmentDirections
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.DeactivateAccountDialogFragmentBinding
+import org.futo.circles.extensions.findParentNavController
+import org.futo.circles.extensions.getText
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showError
+import org.futo.circles.feature.bottom_navigation.BottomNavigationFragmentDirections
import org.koin.androidx.viewmodel.ext.android.viewModel
class DeactivateAccountDialogFragment :
diff --git a/app/src/main/java/com/futo/circles/feature/settings/deactivate/DeactivateAccountViewModel.kt b/app/src/main/java/org/futo/circles/feature/settings/deactivate/DeactivateAccountViewModel.kt
similarity index 69%
rename from app/src/main/java/com/futo/circles/feature/settings/deactivate/DeactivateAccountViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/settings/deactivate/DeactivateAccountViewModel.kt
index 4411eafac..093e7a630 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/deactivate/DeactivateAccountViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/deactivate/DeactivateAccountViewModel.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.settings.deactivate
+package org.futo.circles.feature.settings.deactivate
import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.launchBg
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
class DeactivateAccountViewModel(
private val dataSource: DeactivateAccountDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/settings/edit_profile/EditProfileDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/settings/edit_profile/EditProfileDialogFragment.kt
similarity index 87%
rename from app/src/main/java/com/futo/circles/feature/settings/edit_profile/EditProfileDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/settings/edit_profile/EditProfileDialogFragment.kt
index 5a2ef3dee..76f3dba20 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/edit_profile/EditProfileDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/edit_profile/EditProfileDialogFragment.kt
@@ -1,16 +1,16 @@
-package com.futo.circles.feature.settings.edit_profile
+package org.futo.circles.feature.settings.edit_profile
import android.os.Bundle
import android.view.View
import androidx.core.widget.doAfterTextChanged
import androidx.fragment.app.Fragment
-import com.futo.circles.R
-import com.futo.circles.core.image_picker.ImagePickerHelper
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.databinding.EditProfileDialogFragmentBinding
-import com.futo.circles.extensions.*
-import com.futo.circles.mapping.notEmptyDisplayName
+import org.futo.circles.R
+import org.futo.circles.core.image_picker.ImagePickerHelper
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.EditProfileDialogFragmentBinding
+import org.futo.circles.extensions.*
+import org.futo.circles.mapping.notEmptyDisplayName
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.matrix.android.sdk.api.session.user.model.User
diff --git a/app/src/main/java/com/futo/circles/feature/settings/edit_profile/EditProfileViewModel.kt b/app/src/main/java/org/futo/circles/feature/settings/edit_profile/EditProfileViewModel.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/settings/edit_profile/EditProfileViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/settings/edit_profile/EditProfileViewModel.kt
index 750e2da49..ee7153746 100644
--- a/app/src/main/java/com/futo/circles/feature/settings/edit_profile/EditProfileViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/edit_profile/EditProfileViewModel.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.settings.edit_profile
+package org.futo.circles.feature.settings.edit_profile
import android.net.Uri
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.sign_up.setup_profile.SetupProfileDataSource
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.feature.sign_up.setup_profile.SetupProfileDataSource
class EditProfileViewModel(
private val dataSource: SetupProfileDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/SignUpDataSource.kt b/app/src/main/java/org/futo/circles/feature/sign_up/SignUpDataSource.kt
similarity index 87%
rename from app/src/main/java/com/futo/circles/feature/sign_up/SignUpDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/SignUpDataSource.kt
index 21f8ab664..f532e7a74 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/SignUpDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/SignUpDataSource.kt
@@ -1,16 +1,16 @@
-package com.futo.circles.feature.sign_up
+package org.futo.circles.feature.sign_up
import android.content.Context
import androidx.lifecycle.MutableLiveData
-import com.futo.circles.R
-import com.futo.circles.core.REGISTRATION_TOKEN_KEY_PREFIX
-import com.futo.circles.core.SingleEventLiveData
-import com.futo.circles.core.matrix.pass_phrase.create.CreatePassPhraseDataSource
-import com.futo.circles.core.matrix.room.CoreSpacesTreeBuilder
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.createResult
-import com.futo.circles.provider.MatrixInstanceProvider
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.core.REGISTRATION_TOKEN_KEY_PREFIX
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.core.matrix.pass_phrase.create.CreatePassPhraseDataSource
+import org.futo.circles.core.matrix.room.CoreSpacesTreeBuilder
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.provider.MatrixInstanceProvider
+import org.futo.circles.provider.MatrixSessionProvider
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.coroutineScope
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/SignUpFragment.kt b/app/src/main/java/org/futo/circles/feature/sign_up/SignUpFragment.kt
similarity index 87%
rename from app/src/main/java/com/futo/circles/feature/sign_up/SignUpFragment.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/SignUpFragment.kt
index cdabd0313..4138c3306 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/SignUpFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/SignUpFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.sign_up
+package org.futo.circles.feature.sign_up
import android.os.Bundle
import android.view.View
@@ -8,14 +8,14 @@ import androidx.navigation.findNavController
import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.fragment.findNavController
import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BackPressOwner
-import com.futo.circles.core.matrix.pass_phrase.LoadingDialog
-import com.futo.circles.databinding.SignUpFragmentBinding
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showDialog
-import com.futo.circles.extensions.showError
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BackPressOwner
+import org.futo.circles.core.matrix.pass_phrase.LoadingDialog
+import org.futo.circles.databinding.SignUpFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showDialog
+import org.futo.circles.extensions.showError
import org.koin.androidx.viewmodel.ext.android.viewModel
class SignUpFragment : Fragment(R.layout.sign_up_fragment), BackPressOwner {
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/SignUpViewModel.kt b/app/src/main/java/org/futo/circles/feature/sign_up/SignUpViewModel.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/feature/sign_up/SignUpViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/SignUpViewModel.kt
index 035eaf557..1bdbd508b 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/SignUpViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/SignUpViewModel.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.sign_up
+package org.futo.circles.feature.sign_up
import androidx.lifecycle.ViewModel
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesDataSource.kt b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/SetupCirclesDataSource.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/SetupCirclesDataSource.kt
index c0b0502d3..ca43566ca 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/SetupCirclesDataSource.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.sign_up.setup_circles
+package org.futo.circles.feature.sign_up.setup_circles
import android.content.Context
import android.net.Uri
import androidx.lifecycle.MutableLiveData
-import com.futo.circles.R
-import com.futo.circles.mapping.notEmptyDisplayName
-import com.futo.circles.model.SetupCircleListItem
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.mapping.notEmptyDisplayName
+import org.futo.circles.model.SetupCircleListItem
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.getUser
class SetupCirclesDataSource(
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesFragment.kt b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/SetupCirclesFragment.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesFragment.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/SetupCirclesFragment.kt
index 95c97b381..06807c2b3 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/SetupCirclesFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.sign_up.setup_circles
+package org.futo.circles.feature.sign_up.setup_circles
import android.os.Bundle
import android.view.View
@@ -6,15 +6,15 @@ import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.DividerItemDecoration
import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.core.image_picker.ImagePickerHelper
-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.sign_up.setup_circles.list.SetupCirclesAdapter
-import com.futo.circles.model.SetupCircleListItem
+import org.futo.circles.R
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.core.image_picker.ImagePickerHelper
+import org.futo.circles.databinding.SetupCirclesFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showSuccess
+import org.futo.circles.feature.sign_up.setup_circles.list.SetupCirclesAdapter
+import org.futo.circles.model.SetupCircleListItem
import org.koin.androidx.viewmodel.ext.android.viewModel
class SetupCirclesFragment : Fragment(R.layout.setup_circles_fragment), HasLoadingState {
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesViewModel.kt b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/SetupCirclesViewModel.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/SetupCirclesViewModel.kt
index af3f71d14..ea73005e4 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/SetupCirclesViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/SetupCirclesViewModel.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.sign_up.setup_circles
+package org.futo.circles.feature.sign_up.setup_circles
import android.net.Uri
import androidx.lifecycle.ViewModel
-import com.futo.circles.core.SingleEventLiveData
-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 org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.core.matrix.room.CreateRoomDataSource
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.extensions.launchBg
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesAdapter.kt b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesAdapter.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesAdapter.kt
index 1bf894058..27c930faf 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesAdapter.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.sign_up.setup_circles.list
+package org.futo.circles.feature.sign_up.setup_circles.list
import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.SetupCircleListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.SetupCircleListItem
class SetupCirclesAdapter(
private val onCircleClicked: (SetupCircleListItem) -> Unit
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesViewHolder.kt b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesViewHolder.kt
similarity index 72%
rename from app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesViewHolder.kt
index 9f19db8c4..fc04ac21f 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/setup_circles/list/SetupCirclesViewHolder.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.sign_up.setup_circles.list
+package org.futo.circles.feature.sign_up.setup_circles.list
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.R
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.SetupCircleListItemBinding
-import com.futo.circles.extensions.onClick
-import com.futo.circles.model.SetupCircleListItem
+import org.futo.circles.R
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.SetupCircleListItemBinding
+import org.futo.circles.extensions.onClick
+import org.futo.circles.model.SetupCircleListItem
class SetupCirclesViewHolder(
parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileDataSource.kt b/app/src/main/java/org/futo/circles/feature/sign_up/setup_profile/SetupProfileDataSource.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/setup_profile/SetupProfileDataSource.kt
index baa5c4df6..cb69a146c 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/setup_profile/SetupProfileDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.sign_up.setup_profile
+package org.futo.circles.feature.sign_up.setup_profile
import android.content.Context
import android.net.Uri
-import com.futo.circles.R
-import com.futo.circles.extensions.createResult
-import com.futo.circles.extensions.getFilename
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.extensions.createResult
+import org.futo.circles.extensions.getFilename
+import org.futo.circles.provider.MatrixSessionProvider
import java.util.*
class SetupProfileDataSource(
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileFragment.kt b/app/src/main/java/org/futo/circles/feature/sign_up/setup_profile/SetupProfileFragment.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileFragment.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/setup_profile/SetupProfileFragment.kt
index 877abe958..ae19ae335 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/setup_profile/SetupProfileFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.sign_up.setup_profile
+package org.futo.circles.feature.sign_up.setup_profile
import android.os.Bundle
import android.view.View
@@ -6,14 +6,14 @@ import androidx.core.widget.doAfterTextChanged
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.core.image_picker.ImagePickerHelper
-import com.futo.circles.databinding.SetupProfileFragmentBinding
-import com.futo.circles.extensions.getText
-import com.futo.circles.extensions.observeData
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showDialog
+import org.futo.circles.R
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.core.image_picker.ImagePickerHelper
+import org.futo.circles.databinding.SetupProfileFragmentBinding
+import org.futo.circles.extensions.getText
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showDialog
import org.koin.androidx.viewmodel.ext.android.viewModel
class SetupProfileFragment : Fragment(R.layout.setup_profile_fragment), HasLoadingState {
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileViewModel.kt b/app/src/main/java/org/futo/circles/feature/sign_up/setup_profile/SetupProfileViewModel.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/setup_profile/SetupProfileViewModel.kt
index d2ab165e8..4b8489ce2 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/setup_profile/SetupProfileViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/setup_profile/SetupProfileViewModel.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.sign_up.setup_profile
+package org.futo.circles.feature.sign_up.setup_profile
import android.net.Uri
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 org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
class SetupProfileViewModel(
private val dataSource: SetupProfileDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt b/app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt
index 26f1d8b08..d4b82c6a7 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.sign_up.sign_up_type
+package org.futo.circles.feature.sign_up.sign_up_type
import android.content.Context
-import com.futo.circles.R
-import com.futo.circles.extensions.createResult
-import com.futo.circles.feature.sign_up.SignUpDataSource
-import com.futo.circles.provider.MatrixInstanceProvider
+import org.futo.circles.R
+import org.futo.circles.extensions.createResult
+import org.futo.circles.feature.sign_up.SignUpDataSource
+import org.futo.circles.provider.MatrixInstanceProvider
import org.matrix.android.sdk.api.auth.registration.RegistrationResult
class SelectSignUpTypeDataSource(
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt b/app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt
similarity index 84%
rename from app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt
index a8f44171a..1b5fa5c9e 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt
@@ -1,15 +1,15 @@
-package com.futo.circles.feature.sign_up.sign_up_type
+package org.futo.circles.feature.sign_up.sign_up_type
import android.os.Bundle
import android.view.View
import androidx.core.widget.doAfterTextChanged
import androidx.fragment.app.Fragment
import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.databinding.SelectSignUpTypeFragmentBinding
-import com.futo.circles.extensions.getText
-import com.futo.circles.extensions.observeResponse
+import org.futo.circles.R
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.SelectSignUpTypeFragmentBinding
+import org.futo.circles.extensions.getText
+import org.futo.circles.extensions.observeResponse
import org.koin.androidx.viewmodel.ext.android.viewModel
class SelectSignUpTypeFragment : Fragment(R.layout.select_sign_up_type_fragment), HasLoadingState {
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt b/app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt
similarity index 72%
rename from app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt
index c49ad257d..1c197b9f7 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.sign_up.sign_up_type
+package org.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 org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
class SelectSignUpTypeViewModel(
private val dataSource: SelectSignUpTypeDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsDataSource.kt b/app/src/main/java/org/futo/circles/feature/sign_up/terms/AcceptTermsDataSource.kt
similarity index 69%
rename from app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/terms/AcceptTermsDataSource.kt
index ce4bbd72e..3a7aeb509 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/terms/AcceptTermsDataSource.kt
@@ -1,17 +1,17 @@
-package com.futo.circles.feature.sign_up.terms
+package org.futo.circles.feature.sign_up.terms
import android.content.Context
import androidx.lifecycle.MutableLiveData
-import com.futo.circles.BuildConfig
-import com.futo.circles.R
-import com.futo.circles.core.TERMS_URL_EXTENSION
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.createResult
-import com.futo.circles.extensions.toTermsListItems
-import com.futo.circles.feature.sign_up.SignUpDataSource
-import com.futo.circles.model.TermsListItem
-import com.futo.circles.provider.MatrixInstanceProvider
+import org.futo.circles.BuildConfig
+import org.futo.circles.R
+import org.futo.circles.core.TERMS_URL_EXTENSION
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.extensions.toTermsListItems
+import org.futo.circles.feature.sign_up.SignUpDataSource
+import org.futo.circles.model.TermsListItem
+import org.futo.circles.provider.MatrixInstanceProvider
import org.matrix.android.sdk.api.auth.registration.RegistrationResult
import org.matrix.android.sdk.api.auth.registration.Stage
@@ -45,7 +45,7 @@ class AcceptTermsDataSource(
?: listOf(
TermsListItem(
1, context.getString(R.string.terms_and_conditions),
- BuildConfig.MATRIX_HOME_SERVER_URL + TERMS_URL_EXTENSION
+ org.futo.circles.BuildConfig.MATRIX_HOME_SERVER_URL + TERMS_URL_EXTENSION
)
)
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsFragment.kt b/app/src/main/java/org/futo/circles/feature/sign_up/terms/AcceptTermsFragment.kt
similarity index 77%
rename from app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsFragment.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/terms/AcceptTermsFragment.kt
index 7bf3a395c..d990712b8 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/terms/AcceptTermsFragment.kt
@@ -1,19 +1,19 @@
-package com.futo.circles.feature.sign_up.terms
+package org.futo.circles.feature.sign_up.terms
import android.os.Bundle
import android.view.View
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.DividerItemDecoration
import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.core.fragment.ParentBackPressOwnerFragment
-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.sign_up.terms.list.TermsListAdapter
-import com.futo.circles.model.TermsListItem
+import org.futo.circles.R
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.core.fragment.ParentBackPressOwnerFragment
+import org.futo.circles.databinding.AcceptTermsFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.openCustomTabUrl
+import org.futo.circles.feature.sign_up.terms.list.TermsListAdapter
+import org.futo.circles.model.TermsListItem
import org.koin.androidx.viewmodel.ext.android.viewModel
class AcceptTermsFragment : ParentBackPressOwnerFragment(R.layout.accept_terms_fragment),
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsViewModel.kt b/app/src/main/java/org/futo/circles/feature/sign_up/terms/AcceptTermsViewModel.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/terms/AcceptTermsViewModel.kt
index 7f89bd9fc..8f56fa03a 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/terms/AcceptTermsViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/terms/AcceptTermsViewModel.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.sign_up.terms
+package org.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.model.TermsListItem
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.model.TermsListItem
import org.matrix.android.sdk.api.auth.registration.RegistrationResult
class AcceptTermsViewModel(
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/terms/list/TermsItemViewHolder.kt b/app/src/main/java/org/futo/circles/feature/sign_up/terms/list/TermsItemViewHolder.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/feature/sign_up/terms/list/TermsItemViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/terms/list/TermsItemViewHolder.kt
index b56b08ca3..50d219c05 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/terms/list/TermsItemViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/terms/list/TermsItemViewHolder.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.sign_up.terms.list
+package org.futo.circles.feature.sign_up.terms.list
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.TermsListItemBinding
-import com.futo.circles.extensions.onClick
-import com.futo.circles.model.TermsListItem
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.TermsListItemBinding
+import org.futo.circles.extensions.onClick
+import org.futo.circles.model.TermsListItem
class TermsItemViewHolder(
parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/terms/list/TermsListAdapter.kt b/app/src/main/java/org/futo/circles/feature/sign_up/terms/list/TermsListAdapter.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/sign_up/terms/list/TermsListAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/terms/list/TermsListAdapter.kt
index b216f89b8..d2517745e 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/terms/list/TermsListAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/terms/list/TermsListAdapter.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.sign_up.terms.list
+package org.futo.circles.feature.sign_up.terms.list
import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.TermsListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.TermsListItem
class TermsListAdapter(
private val onViewTerms: (TermsListItem) -> Unit,
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailDataSource.kt b/app/src/main/java/org/futo/circles/feature/sign_up/validate_email/ValidateEmailDataSource.kt
similarity index 66%
rename from app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/validate_email/ValidateEmailDataSource.kt
index dd8912991..cfc7814af 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/validate_email/ValidateEmailDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.sign_up.validate_email
+package org.futo.circles.feature.sign_up.validate_email
-import com.futo.circles.BuildConfig
-import com.futo.circles.core.VALIDATION_TOKEN_SUBMIT_URL_PREFIX
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.createResult
-import com.futo.circles.feature.sign_up.SignUpDataSource
-import com.futo.circles.provider.MatrixInstanceProvider
+import org.futo.circles.BuildConfig
+import org.futo.circles.core.VALIDATION_TOKEN_SUBMIT_URL_PREFIX
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.feature.sign_up.SignUpDataSource
+import org.futo.circles.provider.MatrixInstanceProvider
import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
import org.matrix.android.sdk.api.auth.registration.RegistrationResult
import org.matrix.android.sdk.internal.auth.registration.AddThreePidRegistrationResponse
@@ -26,7 +26,7 @@ class ValidateEmailDataSource(
val result = createResult {
wizard.handleValidateThreePid(
code,
- BuildConfig.MATRIX_HOME_SERVER_URL + VALIDATION_TOKEN_SUBMIT_URL_PREFIX
+ org.futo.circles.BuildConfig.MATRIX_HOME_SERVER_URL + VALIDATION_TOKEN_SUBMIT_URL_PREFIX
)
}
(result as? Response.Success)?.let { signUpDataSource.stageCompleted(result.data) }
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailFragment.kt b/app/src/main/java/org/futo/circles/feature/sign_up/validate_email/ValidateEmailFragment.kt
similarity index 88%
rename from app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailFragment.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/validate_email/ValidateEmailFragment.kt
index 9e7c0ace8..f6956da71 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/validate_email/ValidateEmailFragment.kt
@@ -1,15 +1,15 @@
-package com.futo.circles.feature.sign_up.validate_email
+package org.futo.circles.feature.sign_up.validate_email
import android.os.Bundle
import android.view.View
import androidx.core.widget.doAfterTextChanged
import androidx.fragment.app.Fragment
import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.core.fragment.ParentBackPressOwnerFragment
-import com.futo.circles.databinding.ValidateEmailFragmentBinding
-import com.futo.circles.extensions.*
+import org.futo.circles.R
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.core.fragment.ParentBackPressOwnerFragment
+import org.futo.circles.databinding.ValidateEmailFragmentBinding
+import org.futo.circles.extensions.*
import org.koin.androidx.viewmodel.ext.android.viewModel
class ValidateEmailFragment : ParentBackPressOwnerFragment(R.layout.validate_email_fragment),
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailViewModel.kt b/app/src/main/java/org/futo/circles/feature/sign_up/validate_email/ValidateEmailViewModel.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/validate_email/ValidateEmailViewModel.kt
index 59964c1aa..dab1ef55b 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/validate_email/ValidateEmailViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/validate_email/ValidateEmailViewModel.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.sign_up.validate_email
+package org.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 org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
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/sign_up/validate_token/ValidateTokenDataSource.kt b/app/src/main/java/org/futo/circles/feature/sign_up/validate_token/ValidateTokenDataSource.kt
similarity index 76%
rename from app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/validate_token/ValidateTokenDataSource.kt
index 8f08b6fe6..43864d482 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/validate_token/ValidateTokenDataSource.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.sign_up.validate_token
+package org.futo.circles.feature.sign_up.validate_token
-import com.futo.circles.extensions.Response
-import com.futo.circles.extensions.createResult
-import com.futo.circles.feature.sign_up.SignUpDataSource
-import com.futo.circles.provider.MatrixInstanceProvider
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.createResult
+import org.futo.circles.feature.sign_up.SignUpDataSource
+import org.futo.circles.provider.MatrixInstanceProvider
import org.matrix.android.sdk.api.auth.registration.RegistrationResult
import org.matrix.android.sdk.api.auth.registration.Stage
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenFragment.kt b/app/src/main/java/org/futo/circles/feature/sign_up/validate_token/ValidateTokenFragment.kt
similarity index 77%
rename from app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenFragment.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/validate_token/ValidateTokenFragment.kt
index 2b860036d..89ad81a8f 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/validate_token/ValidateTokenFragment.kt
@@ -1,17 +1,17 @@
-package com.futo.circles.feature.sign_up.validate_token
+package org.futo.circles.feature.sign_up.validate_token
import android.os.Bundle
import android.view.View
import androidx.core.widget.doAfterTextChanged
import androidx.fragment.app.Fragment
import by.kirich1409.viewbindingdelegate.viewBinding
-import com.futo.circles.R
-import com.futo.circles.core.fragment.HasLoadingState
-import com.futo.circles.core.fragment.ParentBackPressOwnerFragment
-import com.futo.circles.databinding.ValidateTokenFragmentBinding
-import com.futo.circles.extensions.getText
-import com.futo.circles.extensions.observeResponse
-import com.futo.circles.extensions.showDialog
+import org.futo.circles.R
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.core.fragment.ParentBackPressOwnerFragment
+import org.futo.circles.databinding.ValidateTokenFragmentBinding
+import org.futo.circles.extensions.getText
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showDialog
import org.koin.androidx.viewmodel.ext.android.viewModel
class ValidateTokenFragment : ParentBackPressOwnerFragment(R.layout.validate_token_fragment),
diff --git a/app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenViewModel.kt b/app/src/main/java/org/futo/circles/feature/sign_up/validate_token/ValidateTokenViewModel.kt
similarity index 69%
rename from app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/sign_up/validate_token/ValidateTokenViewModel.kt
index f8cd9fac1..69082246a 100644
--- a/app/src/main/java/com/futo/circles/feature/sign_up/validate_token/ValidateTokenViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/validate_token/ValidateTokenViewModel.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.sign_up.validate_token
+package org.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 org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
import org.matrix.android.sdk.api.auth.registration.RegistrationResult
class ValidateTokenViewModel(
diff --git a/app/src/main/java/com/futo/circles/feature/splash/SplashFragment.kt b/app/src/main/java/org/futo/circles/feature/splash/SplashFragment.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/splash/SplashFragment.kt
rename to app/src/main/java/org/futo/circles/feature/splash/SplashFragment.kt
index cc0fa729f..adafeba80 100644
--- a/app/src/main/java/com/futo/circles/feature/splash/SplashFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/splash/SplashFragment.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.splash
+package org.futo.circles.feature.splash
import android.os.Bundle
import android.view.View
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
-import com.futo.circles.R
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.provider.MatrixSessionProvider
class SplashFragment : Fragment(R.layout.splash_fragment) {
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/BaseTimelineViewModel.kt b/app/src/main/java/org/futo/circles/feature/timeline/BaseTimelineViewModel.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/timeline/BaseTimelineViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/BaseTimelineViewModel.kt
index e68fac546..440936d99 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/BaseTimelineViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/BaseTimelineViewModel.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.feature.timeline
+package org.futo.circles.feature.timeline
import androidx.lifecycle.ViewModel
-import com.futo.circles.feature.timeline.data_source.TimelineDataSource
+import org.futo.circles.feature.timeline.data_source.TimelineDataSource
abstract class BaseTimelineViewModel(
private val timelineDataSource: TimelineDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/TimelineFragment.kt b/app/src/main/java/org/futo/circles/feature/timeline/TimelineFragment.kt
similarity index 93%
rename from app/src/main/java/com/futo/circles/feature/timeline/TimelineFragment.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/TimelineFragment.kt
index 1553ee7ec..56109697e 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/TimelineFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/TimelineFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.timeline
+package org.futo.circles.feature.timeline
import android.annotation.SuppressLint
import android.net.Uri
@@ -12,19 +12,19 @@ import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
import by.kirich1409.viewbindingdelegate.viewBinding
-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.timeline.list.PostViewHolder
-import com.futo.circles.feature.timeline.list.TimelineAdapter
-import com.futo.circles.feature.timeline.post.CreatePostListener
-import com.futo.circles.feature.timeline.post.emoji.EmojiPickerListener
-import com.futo.circles.feature.timeline.post.share.ShareProvider
-import com.futo.circles.model.CircleRoomTypeArg
-import com.futo.circles.model.ImageContent
-import com.futo.circles.model.PostContent
-import com.futo.circles.view.PostOptionsListener
+import org.futo.circles.R
+import org.futo.circles.core.list.BaseRvDecoration
+import org.futo.circles.databinding.TimelineFragmentBinding
+import org.futo.circles.extensions.*
+import org.futo.circles.feature.timeline.list.PostViewHolder
+import org.futo.circles.feature.timeline.list.TimelineAdapter
+import org.futo.circles.feature.timeline.post.CreatePostListener
+import org.futo.circles.feature.timeline.post.emoji.EmojiPickerListener
+import org.futo.circles.feature.timeline.post.share.ShareProvider
+import org.futo.circles.model.CircleRoomTypeArg
+import org.futo.circles.model.ImageContent
+import org.futo.circles.model.PostContent
+import org.futo.circles.view.PostOptionsListener
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf
import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/TimelineViewModel.kt b/app/src/main/java/org/futo/circles/feature/timeline/TimelineViewModel.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/timeline/TimelineViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/TimelineViewModel.kt
index afbc959ca..7deb0b262 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/TimelineViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/TimelineViewModel.kt
@@ -1,18 +1,18 @@
-package com.futo.circles.feature.timeline
+package org.futo.circles.feature.timeline
import android.net.Uri
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.people.UserOptionsDataSource
-import com.futo.circles.feature.room.LeaveRoomDataSource
-import com.futo.circles.feature.timeline.data_source.SendMessageDataSource
-import com.futo.circles.feature.timeline.post.share.ShareableContent
-import com.futo.circles.feature.timeline.data_source.TimelineDataSource
-import com.futo.circles.feature.timeline.post.PostOptionsDataSource
-import com.futo.circles.model.ImageContent
-import com.futo.circles.model.PostContent
+import org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
+import org.futo.circles.feature.people.UserOptionsDataSource
+import org.futo.circles.feature.room.LeaveRoomDataSource
+import org.futo.circles.feature.timeline.data_source.SendMessageDataSource
+import org.futo.circles.feature.timeline.post.share.ShareableContent
+import org.futo.circles.feature.timeline.data_source.TimelineDataSource
+import org.futo.circles.feature.timeline.post.PostOptionsDataSource
+import org.futo.circles.model.ImageContent
+import org.futo.circles.model.PostContent
import org.matrix.android.sdk.api.util.Cancelable
class TimelineViewModel(
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/data_source/SendMessageDataSource.kt b/app/src/main/java/org/futo/circles/feature/timeline/data_source/SendMessageDataSource.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/timeline/data_source/SendMessageDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/data_source/SendMessageDataSource.kt
index a50772be4..33d182ae1 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/data_source/SendMessageDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/data_source/SendMessageDataSource.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.timeline.data_source
+package org.futo.circles.feature.timeline.data_source
import android.content.Context
import android.net.Uri
-import com.futo.circles.extensions.toImageContentAttachmentData
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.extensions.toImageContentAttachmentData
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.getRoom
class SendMessageDataSource(private val context: Context) {
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/data_source/TimelineBuilder.kt b/app/src/main/java/org/futo/circles/feature/timeline/data_source/TimelineBuilder.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/feature/timeline/data_source/TimelineBuilder.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/data_source/TimelineBuilder.kt
index a4dd81b62..8c0f24e84 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/data_source/TimelineBuilder.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/data_source/TimelineBuilder.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.timeline.data_source
+package org.futo.circles.feature.timeline.data_source
-import com.futo.circles.mapping.toPost
-import com.futo.circles.model.Post
-import com.futo.circles.model.PostContentType
-import com.futo.circles.model.ReplyPost
-import com.futo.circles.model.RootPost
+import org.futo.circles.mapping.toPost
+import org.futo.circles.model.Post
+import org.futo.circles.model.PostContentType
+import org.futo.circles.model.ReplyPost
+import org.futo.circles.model.RootPost
import org.matrix.android.sdk.api.session.events.model.EventType
import org.matrix.android.sdk.api.session.events.model.toModel
import org.matrix.android.sdk.api.session.room.model.message.MessageContent
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/data_source/TimelineDataSource.kt b/app/src/main/java/org/futo/circles/feature/timeline/data_source/TimelineDataSource.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/feature/timeline/data_source/TimelineDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/data_source/TimelineDataSource.kt
index bb5524ce4..e1776757a 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/data_source/TimelineDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/data_source/TimelineDataSource.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.timeline.data_source
+package org.futo.circles.feature.timeline.data_source
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.asFlow
import androidx.lifecycle.map
-import com.futo.circles.mapping.nameOrId
-import com.futo.circles.model.CircleRoomTypeArg
-import com.futo.circles.model.Post
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.mapping.nameOrId
+import org.futo.circles.model.CircleRoomTypeArg
+import org.futo.circles.model.Post
+import org.futo.circles.provider.MatrixSessionProvider
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.mapNotNull
import org.matrix.android.sdk.api.session.events.model.EventType
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/list/TimelineAdapter.kt b/app/src/main/java/org/futo/circles/feature/timeline/list/TimelineAdapter.kt
similarity index 87%
rename from app/src/main/java/com/futo/circles/feature/timeline/list/TimelineAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/list/TimelineAdapter.kt
index c908d845e..037fe96cc 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/list/TimelineAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/list/TimelineAdapter.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.timeline.list
+package org.futo.circles.feature.timeline.list
import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.Post
-import com.futo.circles.model.PostContentType
-import com.futo.circles.model.PostItemPayload
-import com.futo.circles.model.RootPost
-import com.futo.circles.view.PostOptionsListener
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.Post
+import org.futo.circles.model.PostContentType
+import org.futo.circles.model.PostItemPayload
+import org.futo.circles.model.RootPost
+import org.futo.circles.view.PostOptionsListener
class TimelineAdapter(
private val userPowerLevel: Int,
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/list/TimelineViewHolder.kt b/app/src/main/java/org/futo/circles/feature/timeline/list/TimelineViewHolder.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/feature/timeline/list/TimelineViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/list/TimelineViewHolder.kt
index a3c7899c6..42ec3190c 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/list/TimelineViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/list/TimelineViewHolder.kt
@@ -1,23 +1,23 @@
-package com.futo.circles.feature.timeline.list
+package org.futo.circles.feature.timeline.list
import android.util.Size
import android.view.View
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.R
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.ImagePostViewBinding
-import com.futo.circles.databinding.TextPostViewBinding
-import com.futo.circles.extensions.UriContentScheme
-import com.futo.circles.extensions.gone
-import com.futo.circles.extensions.loadEncryptedImage
-import com.futo.circles.model.ImageContent
-import com.futo.circles.model.Post
-import com.futo.circles.model.PostItemPayload
-import com.futo.circles.model.TextContent
-import com.futo.circles.provider.MatrixSessionProvider
-import com.futo.circles.view.PostOptionsListener
-import com.futo.circles.view.PostLayout
+import org.futo.circles.R
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.ImagePostViewBinding
+import org.futo.circles.databinding.TextPostViewBinding
+import org.futo.circles.extensions.UriContentScheme
+import org.futo.circles.extensions.gone
+import org.futo.circles.extensions.loadEncryptedImage
+import org.futo.circles.model.ImageContent
+import org.futo.circles.model.Post
+import org.futo.circles.model.PostItemPayload
+import org.futo.circles.model.TextContent
+import org.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.view.PostOptionsListener
+import org.futo.circles.view.PostLayout
import org.matrix.android.sdk.api.session.content.ContentUploadStateTracker
sealed class PostViewHolder(view: View, private val userPowerLevel: Int) :
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/list/UploadImageProgressHelper.kt b/app/src/main/java/org/futo/circles/feature/timeline/list/UploadImageProgressHelper.kt
similarity index 87%
rename from app/src/main/java/com/futo/circles/feature/timeline/list/UploadImageProgressHelper.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/list/UploadImageProgressHelper.kt
index 19aeb7dda..3069c32b6 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/list/UploadImageProgressHelper.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/list/UploadImageProgressHelper.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.feature.timeline.list
+package org.futo.circles.feature.timeline.list
-import com.futo.circles.R
-import com.futo.circles.extensions.gone
-import com.futo.circles.extensions.visible
-import com.futo.circles.model.LoadingData
-import com.futo.circles.view.LoadingView
+import org.futo.circles.R
+import org.futo.circles.extensions.gone
+import org.futo.circles.extensions.visible
+import org.futo.circles.model.LoadingData
+import org.futo.circles.view.LoadingView
import org.matrix.android.sdk.api.session.content.ContentUploadStateTracker
object UploadImageProgressHelper {
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/CreatePostBottomSheet.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/CreatePostBottomSheet.kt
similarity index 93%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/CreatePostBottomSheet.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/CreatePostBottomSheet.kt
index afa168edd..049a0f6a8 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/CreatePostBottomSheet.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/CreatePostBottomSheet.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.timeline.post
+package org.futo.circles.feature.timeline.post
import android.content.Context
import android.net.Uri
@@ -8,10 +8,10 @@ import android.view.View
import android.view.ViewGroup
import android.view.WindowManager
import androidx.navigation.fragment.navArgs
-import com.futo.circles.R
-import com.futo.circles.core.image_picker.ImagePickerHelper
-import com.futo.circles.databinding.CreatePostBottomSheetBinding
-import com.futo.circles.view.PreviewPostListener
+import org.futo.circles.R
+import org.futo.circles.core.image_picker.ImagePickerHelper
+import org.futo.circles.databinding.CreatePostBottomSheetBinding
+import org.futo.circles.view.PreviewPostListener
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/PostOptionsDataSource.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/PostOptionsDataSource.kt
similarity index 76%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/PostOptionsDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/PostOptionsDataSource.kt
index 8c3a2f9f6..bc805c95f 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/PostOptionsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/PostOptionsDataSource.kt
@@ -1,16 +1,16 @@
-package com.futo.circles.feature.timeline.post
+package org.futo.circles.feature.timeline.post
import android.content.Context
import com.bumptech.glide.Glide
-import com.futo.circles.extensions.createResult
-import com.futo.circles.extensions.getUri
-import com.futo.circles.extensions.saveImageToDeviceGallery
-import com.futo.circles.feature.timeline.post.share.ImageShareable
-import com.futo.circles.feature.timeline.post.share.TextShareable
-import com.futo.circles.model.ImageContent
-import com.futo.circles.model.PostContent
-import com.futo.circles.model.TextContent
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.extensions.createResult
+import org.futo.circles.extensions.getUri
+import org.futo.circles.extensions.saveImageToDeviceGallery
+import org.futo.circles.feature.timeline.post.share.ImageShareable
+import org.futo.circles.feature.timeline.post.share.TextShareable
+import org.futo.circles.model.ImageContent
+import org.futo.circles.model.PostContent
+import org.futo.circles.model.TextContent
+import org.futo.circles.provider.MatrixSessionProvider
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.matrix.android.sdk.api.session.getRoom
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt
index 2a82e45ac..ca9acefc5 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.timeline.post.emoji
+package org.futo.circles.feature.timeline.post.emoji
import android.content.Context
import android.os.Bundle
@@ -7,11 +7,11 @@ import android.view.View
import android.view.ViewGroup
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.timeline.post.emoji.list.EmojiAdapter
-import com.futo.circles.model.EmojiCategory
-import com.futo.circles.model.EmojiItem
+import org.futo.circles.databinding.EmojiBottomSheetBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.feature.timeline.post.emoji.list.EmojiAdapter
+import org.futo.circles.model.EmojiCategory
+import org.futo.circles.model.EmojiItem
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiDataSource.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiDataSource.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiDataSource.kt
index 718216589..fabdcf6fc 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiDataSource.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.feature.timeline.post.emoji
+package org.futo.circles.feature.timeline.post.emoji
import android.content.Context
import android.graphics.Paint
import androidx.core.graphics.PaintCompat
-import com.futo.circles.R
-import com.futo.circles.model.EmojiCategory
-import com.futo.circles.model.EmojiData
-import com.futo.circles.model.EmojiItem
+import org.futo.circles.R
+import org.futo.circles.model.EmojiCategory
+import org.futo.circles.model.EmojiData
+import org.futo.circles.model.EmojiItem
import com.google.gson.Gson
class EmojiDataSource(context: Context) {
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiViewModel.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiViewModel.kt
similarity index 84%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiViewModel.kt
index 581b6f8ee..e3e4a6ab4 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/EmojiViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiViewModel.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.timeline.post.emoji
+package org.futo.circles.feature.timeline.post.emoji
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
-import com.futo.circles.model.EmojiItem
+import org.futo.circles.model.EmojiItem
class EmojiViewModel(private val emojiDataSource: EmojiDataSource) : ViewModel() {
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/list/EmojiAdapter.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/list/EmojiAdapter.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/emoji/list/EmojiAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/emoji/list/EmojiAdapter.kt
index dc0ba6d5c..3ca093f29 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/list/EmojiAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/list/EmojiAdapter.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.timeline.post.emoji.list
+package org.futo.circles.feature.timeline.post.emoji.list
import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.EmojiItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.EmojiItem
class EmojiAdapter(
private val onEmojiSelected: (item: EmojiItem) -> Unit
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/list/EmojiViewHolder.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/list/EmojiViewHolder.kt
similarity index 67%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/emoji/list/EmojiViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/emoji/list/EmojiViewHolder.kt
index 42acada3b..f22095e51 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/emoji/list/EmojiViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/emoji/list/EmojiViewHolder.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.timeline.post.emoji.list
+package org.futo.circles.feature.timeline.post.emoji.list
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.EmojiListItemBinding
-import com.futo.circles.extensions.onClick
-import com.futo.circles.model.EmojiItem
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.EmojiListItemBinding
+import org.futo.circles.extensions.onClick
+import org.futo.circles.model.EmojiItem
class EmojiViewHolder(
parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportDataSource.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/report/ReportDataSource.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportDataSource.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/report/ReportDataSource.kt
index cc3b2980b..7621cfb18 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/report/ReportDataSource.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.timeline.post.report
+package org.futo.circles.feature.timeline.post.report
import android.content.Context
import androidx.lifecycle.MutableLiveData
-import com.futo.circles.R
-import com.futo.circles.extensions.createResult
-import com.futo.circles.model.ReportCategoryListItem
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.extensions.createResult
+import org.futo.circles.model.ReportCategoryListItem
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.getRoom
class ReportDataSource(
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/report/ReportDialogFragment.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportDialogFragment.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/report/ReportDialogFragment.kt
index 1c69c5653..93797c871 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/report/ReportDialogFragment.kt
@@ -1,17 +1,17 @@
-package com.futo.circles.feature.timeline.post.report
+package org.futo.circles.feature.timeline.post.report
import android.os.Bundle
import android.view.View
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.navArgs
-import com.futo.circles.R
-import com.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import com.futo.circles.core.fragment.HasLoadingState
-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.timeline.post.report.list.ReportCategoryAdapter
+import org.futo.circles.R
+import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
+import org.futo.circles.core.fragment.HasLoadingState
+import org.futo.circles.databinding.ReportDialogFragmentBinding
+import org.futo.circles.extensions.observeData
+import org.futo.circles.extensions.observeResponse
+import org.futo.circles.extensions.showSuccess
+import org.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/timeline/post/report/ReportViewModel.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/report/ReportViewModel.kt
similarity index 72%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportViewModel.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/report/ReportViewModel.kt
index 985031212..bda1b5453 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/report/ReportViewModel.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/report/ReportViewModel.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.timeline.post.report
+package org.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 org.futo.circles.core.SingleEventLiveData
+import org.futo.circles.extensions.Response
+import org.futo.circles.extensions.launchBg
class ReportViewModel(
private val reportDataSource: ReportDataSource
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/report/list/ReportCategoryAdapter.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/report/list/ReportCategoryAdapter.kt
similarity index 79%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/report/list/ReportCategoryAdapter.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/report/list/ReportCategoryAdapter.kt
index 8b04acea5..ae66f638f 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/report/list/ReportCategoryAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/report/list/ReportCategoryAdapter.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.feature.timeline.post.report.list
+package org.futo.circles.feature.timeline.post.report.list
import android.view.ViewGroup
-import com.futo.circles.core.list.BaseRvAdapter
-import com.futo.circles.model.ReportCategoryListItem
+import org.futo.circles.core.list.BaseRvAdapter
+import org.futo.circles.model.ReportCategoryListItem
class ReportCategoryAdapter(
private val onCategorySelected: (id: Int) -> Unit
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/report/list/ReportCategoryViewHolder.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/report/list/ReportCategoryViewHolder.kt
similarity index 69%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/report/list/ReportCategoryViewHolder.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/report/list/ReportCategoryViewHolder.kt
index e6abebbae..fc9b34552 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/report/list/ReportCategoryViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/report/list/ReportCategoryViewHolder.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.feature.timeline.post.report.list
+package org.futo.circles.feature.timeline.post.report.list
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import com.futo.circles.core.list.ViewBindingHolder
-import com.futo.circles.databinding.ReportCategoryListItemBinding
-import com.futo.circles.extensions.onClick
-import com.futo.circles.model.ReportCategoryListItem
+import org.futo.circles.core.list.ViewBindingHolder
+import org.futo.circles.databinding.ReportCategoryListItemBinding
+import org.futo.circles.extensions.onClick
+import org.futo.circles.model.ReportCategoryListItem
class ReportCategoryViewHolder(
parent: ViewGroup,
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/share/SharableContent.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/share/SharableContent.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/share/SharableContent.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/share/SharableContent.kt
index f21683f52..6e5a46c5e 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/share/SharableContent.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/share/SharableContent.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.feature.timeline.post.share
+package org.futo.circles.feature.timeline.post.share
import android.net.Uri
diff --git a/app/src/main/java/com/futo/circles/feature/timeline/post/share/ShareProvider.kt b/app/src/main/java/org/futo/circles/feature/timeline/post/share/ShareProvider.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/feature/timeline/post/share/ShareProvider.kt
rename to app/src/main/java/org/futo/circles/feature/timeline/post/share/ShareProvider.kt
index e01cdc3f1..802a6d9cc 100644
--- a/app/src/main/java/com/futo/circles/feature/timeline/post/share/ShareProvider.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/post/share/ShareProvider.kt
@@ -1,9 +1,9 @@
-package com.futo.circles.feature.timeline.post.share
+package org.futo.circles.feature.timeline.post.share
import android.content.Context
import android.content.Intent
import android.net.Uri
-import com.futo.circles.R
+import org.futo.circles.R
object ShareProvider {
diff --git a/app/src/main/java/com/futo/circles/glide/CirclesAppGlideModule.kt b/app/src/main/java/org/futo/circles/glide/CirclesAppGlideModule.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/glide/CirclesAppGlideModule.kt
rename to app/src/main/java/org/futo/circles/glide/CirclesAppGlideModule.kt
index db1db9f85..a0a951a43 100644
--- a/app/src/main/java/com/futo/circles/glide/CirclesAppGlideModule.kt
+++ b/app/src/main/java/org/futo/circles/glide/CirclesAppGlideModule.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.glide
+package org.futo.circles.glide
import android.content.Context
import android.util.Log
@@ -7,7 +7,7 @@ import com.bumptech.glide.GlideBuilder
import com.bumptech.glide.Registry
import com.bumptech.glide.annotation.GlideModule
import com.bumptech.glide.module.AppGlideModule
-import com.futo.circles.model.ImageContent
+import org.futo.circles.model.ImageContent
import java.io.InputStream
@GlideModule
diff --git a/app/src/main/java/com/futo/circles/glide/CirclesGlideDataFetcher.kt b/app/src/main/java/org/futo/circles/glide/CirclesGlideDataFetcher.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/glide/CirclesGlideDataFetcher.kt
rename to app/src/main/java/org/futo/circles/glide/CirclesGlideDataFetcher.kt
index 39ed25d4f..c743d2c8b 100644
--- a/app/src/main/java/com/futo/circles/glide/CirclesGlideDataFetcher.kt
+++ b/app/src/main/java/org/futo/circles/glide/CirclesGlideDataFetcher.kt
@@ -1,13 +1,13 @@
-package com.futo.circles.glide
+package org.futo.circles.glide
import android.content.Context
import android.util.Log
import com.bumptech.glide.Priority
import com.bumptech.glide.load.DataSource
import com.bumptech.glide.load.data.DataFetcher
-import com.futo.circles.extensions.coroutineScope
-import com.futo.circles.model.ImageContent
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.extensions.coroutineScope
+import org.futo.circles.model.ImageContent
+import org.futo.circles.provider.MatrixSessionProvider
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
diff --git a/app/src/main/java/com/futo/circles/glide/CirclesGlideModelLoaderFactory.kt b/app/src/main/java/org/futo/circles/glide/CirclesGlideModelLoaderFactory.kt
similarity index 93%
rename from app/src/main/java/com/futo/circles/glide/CirclesGlideModelLoaderFactory.kt
rename to app/src/main/java/org/futo/circles/glide/CirclesGlideModelLoaderFactory.kt
index 6a1cade23..2f0608d5f 100644
--- a/app/src/main/java/com/futo/circles/glide/CirclesGlideModelLoaderFactory.kt
+++ b/app/src/main/java/org/futo/circles/glide/CirclesGlideModelLoaderFactory.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.glide
+package org.futo.circles.glide
import android.content.Context
import com.bumptech.glide.load.Options
@@ -6,7 +6,7 @@ import com.bumptech.glide.load.model.ModelLoader
import com.bumptech.glide.load.model.ModelLoaderFactory
import com.bumptech.glide.load.model.MultiModelLoaderFactory
import com.bumptech.glide.signature.ObjectKey
-import com.futo.circles.model.ImageContent
+import org.futo.circles.model.ImageContent
import java.io.InputStream
class CirclesGlideModelLoaderFactory(private val context: Context) :
diff --git a/app/src/main/java/com/futo/circles/glide/LocalFileHelper.kt b/app/src/main/java/org/futo/circles/glide/LocalFileHelper.kt
similarity index 95%
rename from app/src/main/java/com/futo/circles/glide/LocalFileHelper.kt
rename to app/src/main/java/org/futo/circles/glide/LocalFileHelper.kt
index ff0c3588d..4991a38e0 100644
--- a/app/src/main/java/com/futo/circles/glide/LocalFileHelper.kt
+++ b/app/src/main/java/org/futo/circles/glide/LocalFileHelper.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.glide
+package org.futo.circles.glide
import android.content.Context
import android.net.Uri
diff --git a/app/src/main/java/com/futo/circles/mapping/FollowingListItemMapping.kt b/app/src/main/java/org/futo/circles/mapping/FollowingListItemMapping.kt
similarity index 70%
rename from app/src/main/java/com/futo/circles/mapping/FollowingListItemMapping.kt
rename to app/src/main/java/org/futo/circles/mapping/FollowingListItemMapping.kt
index fb48a5574..443d82148 100644
--- a/app/src/main/java/com/futo/circles/mapping/FollowingListItemMapping.kt
+++ b/app/src/main/java/org/futo/circles/mapping/FollowingListItemMapping.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.mapping
+package org.futo.circles.mapping
-import com.futo.circles.extensions.getRoomOwners
-import com.futo.circles.extensions.getTimelineRoomFor
-import com.futo.circles.model.FollowingListItem
+import org.futo.circles.extensions.getRoomOwners
+import org.futo.circles.extensions.getTimelineRoomFor
+import org.futo.circles.model.FollowingListItem
import org.matrix.android.sdk.api.session.room.model.RoomSummary
fun RoomSummary.toFollowingListItem(circleId: String) = FollowingListItem(
diff --git a/app/src/main/java/com/futo/circles/mapping/MatrixUserMapping.kt b/app/src/main/java/org/futo/circles/mapping/MatrixUserMapping.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/mapping/MatrixUserMapping.kt
rename to app/src/main/java/org/futo/circles/mapping/MatrixUserMapping.kt
index 43ad67446..8ce1a7ca8 100644
--- a/app/src/main/java/com/futo/circles/mapping/MatrixUserMapping.kt
+++ b/app/src/main/java/org/futo/circles/mapping/MatrixUserMapping.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.mapping
+package org.futo.circles.mapping
-import com.futo.circles.model.CirclesUserSummary
-import com.futo.circles.model.PeopleUserListItem
-import com.futo.circles.model.UserListItem
+import org.futo.circles.model.CirclesUserSummary
+import org.futo.circles.model.PeopleUserListItem
+import org.futo.circles.model.UserListItem
import org.matrix.android.sdk.api.session.user.model.User
fun User.toUserListItem(isSelected: Boolean) = UserListItem(
diff --git a/app/src/main/java/com/futo/circles/mapping/RoomListItemMapping.kt b/app/src/main/java/org/futo/circles/mapping/RoomListItemMapping.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/mapping/RoomListItemMapping.kt
rename to app/src/main/java/org/futo/circles/mapping/RoomListItemMapping.kt
index eedb79109..f0cb5a8ca 100644
--- a/app/src/main/java/com/futo/circles/mapping/RoomListItemMapping.kt
+++ b/app/src/main/java/org/futo/circles/mapping/RoomListItemMapping.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.mapping
+package org.futo.circles.mapping
-import com.futo.circles.extensions.getTimelineRoomFor
-import com.futo.circles.model.*
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.extensions.getTimelineRoomFor
+import org.futo.circles.model.*
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.getUser
import org.matrix.android.sdk.api.session.room.model.RoomSummary
diff --git a/app/src/main/java/com/futo/circles/mapping/RoomMemberSummaryMapping.kt b/app/src/main/java/org/futo/circles/mapping/RoomMemberSummaryMapping.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/mapping/RoomMemberSummaryMapping.kt
rename to app/src/main/java/org/futo/circles/mapping/RoomMemberSummaryMapping.kt
index d32e9d3ec..368b95ac6 100644
--- a/app/src/main/java/com/futo/circles/mapping/RoomMemberSummaryMapping.kt
+++ b/app/src/main/java/org/futo/circles/mapping/RoomMemberSummaryMapping.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.mapping
+package org.futo.circles.mapping
-import com.futo.circles.model.CirclesUserSummary
-import com.futo.circles.model.GroupMemberListItem
-import com.futo.circles.model.InvitedUserListItem
+import org.futo.circles.model.CirclesUserSummary
+import org.futo.circles.model.GroupMemberListItem
+import org.futo.circles.model.InvitedUserListItem
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.Role
diff --git a/app/src/main/java/com/futo/circles/mapping/TimelineEventMapping.kt b/app/src/main/java/org/futo/circles/mapping/TimelineEventMapping.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/mapping/TimelineEventMapping.kt
rename to app/src/main/java/org/futo/circles/mapping/TimelineEventMapping.kt
index 0b1346a87..44e8bdc6b 100644
--- a/app/src/main/java/com/futo/circles/mapping/TimelineEventMapping.kt
+++ b/app/src/main/java/org/futo/circles/mapping/TimelineEventMapping.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.mapping
+package org.futo.circles.mapping
import com.bumptech.glide.request.target.Target
-import com.futo.circles.model.*
+import org.futo.circles.model.*
import org.matrix.android.sdk.api.session.crypto.attachments.toElementToDecrypt
import org.matrix.android.sdk.api.session.events.model.toModel
import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
diff --git a/app/src/main/java/com/futo/circles/model/AccessLevel.kt b/app/src/main/java/org/futo/circles/model/AccessLevel.kt
similarity index 86%
rename from app/src/main/java/com/futo/circles/model/AccessLevel.kt
rename to app/src/main/java/org/futo/circles/model/AccessLevel.kt
index 3499eca42..5794ffbad 100644
--- a/app/src/main/java/com/futo/circles/model/AccessLevel.kt
+++ b/app/src/main/java/org/futo/circles/model/AccessLevel.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
import org.matrix.android.sdk.api.session.room.powerlevels.Role
diff --git a/app/src/main/java/com/futo/circles/model/AccessLevelListItem.kt b/app/src/main/java/org/futo/circles/model/AccessLevelListItem.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/model/AccessLevelListItem.kt
rename to app/src/main/java/org/futo/circles/model/AccessLevelListItem.kt
index 624b65ca4..f85711964 100644
--- a/app/src/main/java/com/futo/circles/model/AccessLevelListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/AccessLevelListItem.kt
@@ -1,6 +1,6 @@
-package com.futo.circles.model
+package org.futo.circles.model
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.core.list.IdEntity
import org.matrix.android.sdk.api.session.room.powerlevels.Role
data class AccessLevelListItem(
diff --git a/app/src/main/java/com/futo/circles/model/ActiveSessionListItem.kt b/app/src/main/java/org/futo/circles/model/ActiveSessionListItem.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/model/ActiveSessionListItem.kt
rename to app/src/main/java/org/futo/circles/model/ActiveSessionListItem.kt
index 4a7029774..bed71d3b2 100644
--- a/app/src/main/java/com/futo/circles/model/ActiveSessionListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/ActiveSessionListItem.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.model
+package org.futo.circles.model
-import com.futo.circles.core.list.IdEntity
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.list.IdEntity
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
diff --git a/app/src/main/java/com/futo/circles/model/CircleListItemPayload.kt b/app/src/main/java/org/futo/circles/model/CircleListItemPayload.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/model/CircleListItemPayload.kt
rename to app/src/main/java/org/futo/circles/model/CircleListItemPayload.kt
index b07b02ac8..599f028e8 100644
--- a/app/src/main/java/com/futo/circles/model/CircleListItemPayload.kt
+++ b/app/src/main/java/org/futo/circles/model/CircleListItemPayload.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
data class CircleListItemPayload(
val followersCount: Int,
diff --git a/app/src/main/java/com/futo/circles/model/CircleRoomTypeArg.kt b/app/src/main/java/org/futo/circles/model/CircleRoomTypeArg.kt
similarity index 63%
rename from app/src/main/java/com/futo/circles/model/CircleRoomTypeArg.kt
rename to app/src/main/java/org/futo/circles/model/CircleRoomTypeArg.kt
index f4578b259..947b4b8b0 100644
--- a/app/src/main/java/com/futo/circles/model/CircleRoomTypeArg.kt
+++ b/app/src/main/java/org/futo/circles/model/CircleRoomTypeArg.kt
@@ -1,3 +1,3 @@
-package com.futo.circles.model
+package org.futo.circles.model
enum class CircleRoomTypeArg { Circle, Group, Photo }
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/circles/model/CirclesRoom.kt b/app/src/main/java/org/futo/circles/model/CirclesRoom.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/model/CirclesRoom.kt
rename to app/src/main/java/org/futo/circles/model/CirclesRoom.kt
index 41635e986..722e9bc2c 100644
--- a/app/src/main/java/com/futo/circles/model/CirclesRoom.kt
+++ b/app/src/main/java/org/futo/circles/model/CirclesRoom.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.model
+package org.futo.circles.model
import androidx.annotation.StringRes
-import com.futo.circles.R
+import org.futo.circles.R
import org.matrix.android.sdk.api.session.room.model.RoomType
private const val ROOT_SPACE_TAG = "m.space.root"
diff --git a/app/src/main/java/com/futo/circles/model/CirclesUserSummary.kt b/app/src/main/java/org/futo/circles/model/CirclesUserSummary.kt
similarity index 76%
rename from app/src/main/java/com/futo/circles/model/CirclesUserSummary.kt
rename to app/src/main/java/org/futo/circles/model/CirclesUserSummary.kt
index f6ae56ac2..9e7b3db50 100644
--- a/app/src/main/java/com/futo/circles/model/CirclesUserSummary.kt
+++ b/app/src/main/java/org/futo/circles/model/CirclesUserSummary.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
data class CirclesUserSummary(
val id: String,
diff --git a/app/src/main/java/com/futo/circles/model/EmojiCategory.kt b/app/src/main/java/org/futo/circles/model/EmojiCategory.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/model/EmojiCategory.kt
rename to app/src/main/java/org/futo/circles/model/EmojiCategory.kt
index 7ef62d4c6..681fc6560 100644
--- a/app/src/main/java/com/futo/circles/model/EmojiCategory.kt
+++ b/app/src/main/java/org/futo/circles/model/EmojiCategory.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
data class EmojiCategory(
val id: String,
diff --git a/app/src/main/java/com/futo/circles/model/EmojiData.kt b/app/src/main/java/org/futo/circles/model/EmojiData.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/model/EmojiData.kt
rename to app/src/main/java/org/futo/circles/model/EmojiData.kt
index 0921a5841..0444ae45f 100644
--- a/app/src/main/java/com/futo/circles/model/EmojiData.kt
+++ b/app/src/main/java/org/futo/circles/model/EmojiData.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
data class EmojiData(
val categories: List<EmojiCategory>,
diff --git a/app/src/main/java/com/futo/circles/model/EmojiItem.kt b/app/src/main/java/org/futo/circles/model/EmojiItem.kt
similarity index 80%
rename from app/src/main/java/com/futo/circles/model/EmojiItem.kt
rename to app/src/main/java/org/futo/circles/model/EmojiItem.kt
index ec99e79e3..5378952a4 100644
--- a/app/src/main/java/com/futo/circles/model/EmojiItem.kt
+++ b/app/src/main/java/org/futo/circles/model/EmojiItem.kt
@@ -1,6 +1,6 @@
-package com.futo.circles.model
+package org.futo.circles.model
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.core.list.IdEntity
import com.google.gson.annotations.SerializedName
data class EmojiItem(
diff --git a/app/src/main/java/com/futo/circles/model/FollowingListItem.kt b/app/src/main/java/org/futo/circles/model/FollowingListItem.kt
similarity index 74%
rename from app/src/main/java/com/futo/circles/model/FollowingListItem.kt
rename to app/src/main/java/org/futo/circles/model/FollowingListItem.kt
index 9708d126c..15f4c95d6 100644
--- a/app/src/main/java/com/futo/circles/model/FollowingListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/FollowingListItem.kt
@@ -1,6 +1,6 @@
-package com.futo.circles.model
+package org.futo.circles.model
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.core.list.IdEntity
data class FollowingListItem(
override val id: String,
diff --git a/app/src/main/java/com/futo/circles/model/GalleryImageListItem.kt b/app/src/main/java/org/futo/circles/model/GalleryImageListItem.kt
similarity index 66%
rename from app/src/main/java/com/futo/circles/model/GalleryImageListItem.kt
rename to app/src/main/java/org/futo/circles/model/GalleryImageListItem.kt
index 26ef8b3e5..7af0f8ca4 100644
--- a/app/src/main/java/com/futo/circles/model/GalleryImageListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/GalleryImageListItem.kt
@@ -1,6 +1,6 @@
-package com.futo.circles.model
+package org.futo.circles.model
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.core.list.IdEntity
data class GalleryImageListItem(
override val id: String,
diff --git a/app/src/main/java/com/futo/circles/model/GroupListItemPayload.kt b/app/src/main/java/org/futo/circles/model/GroupListItemPayload.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/model/GroupListItemPayload.kt
rename to app/src/main/java/org/futo/circles/model/GroupListItemPayload.kt
index c51349def..da7720f7a 100644
--- a/app/src/main/java/com/futo/circles/model/GroupListItemPayload.kt
+++ b/app/src/main/java/org/futo/circles/model/GroupListItemPayload.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
data class GroupListItemPayload(
val topic: String?,
diff --git a/app/src/main/java/com/futo/circles/model/GroupMemberListItem.kt b/app/src/main/java/org/futo/circles/model/GroupMemberListItem.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/model/GroupMemberListItem.kt
rename to app/src/main/java/org/futo/circles/model/GroupMemberListItem.kt
index c242c65e9..2c0c0dbc7 100644
--- a/app/src/main/java/com/futo/circles/model/GroupMemberListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/GroupMemberListItem.kt
@@ -1,11 +1,11 @@
-package com.futo.circles.model
-
-import com.futo.circles.core.list.IdEntity
-import com.futo.circles.extensions.getCurrentUserPowerLevel
-import com.futo.circles.extensions.isCurrentUserAbleToBan
-import com.futo.circles.extensions.isCurrentUserAbleToChangeSettings
-import com.futo.circles.extensions.isCurrentUserAbleToKick
-import com.futo.circles.provider.MatrixSessionProvider
+package org.futo.circles.model
+
+import org.futo.circles.core.list.IdEntity
+import org.futo.circles.extensions.getCurrentUserPowerLevel
+import org.futo.circles.extensions.isCurrentUserAbleToBan
+import org.futo.circles.extensions.isCurrentUserAbleToChangeSettings
+import org.futo.circles.extensions.isCurrentUserAbleToKick
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
import org.matrix.android.sdk.api.session.room.powerlevels.Role
diff --git a/app/src/main/java/com/futo/circles/model/InviteMemberListItem.kt b/app/src/main/java/org/futo/circles/model/InviteMemberListItem.kt
similarity index 86%
rename from app/src/main/java/com/futo/circles/model/InviteMemberListItem.kt
rename to app/src/main/java/org/futo/circles/model/InviteMemberListItem.kt
index 48a6a71d9..60e88f5be 100644
--- a/app/src/main/java/com/futo/circles/model/InviteMemberListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/InviteMemberListItem.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.model
+package org.futo.circles.model
-import com.futo.circles.R
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.R
+import org.futo.circles.core.list.IdEntity
sealed class InviteMemberListItem : IdEntity<String>
diff --git a/app/src/main/java/com/futo/circles/model/LoadingData.kt b/app/src/main/java/org/futo/circles/model/LoadingData.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/model/LoadingData.kt
rename to app/src/main/java/org/futo/circles/model/LoadingData.kt
index bfaa3ec22..e12bdacaf 100644
--- a/app/src/main/java/com/futo/circles/model/LoadingData.kt
+++ b/app/src/main/java/org/futo/circles/model/LoadingData.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.model
+package org.futo.circles.model
import androidx.annotation.StringRes
-import com.futo.circles.R
+import org.futo.circles.R
data class LoadingData(
@StringRes var messageId: Int = R.string.loading,
diff --git a/app/src/main/java/com/futo/circles/model/PeopleListItem.kt b/app/src/main/java/org/futo/circles/model/PeopleListItem.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/model/PeopleListItem.kt
rename to app/src/main/java/org/futo/circles/model/PeopleListItem.kt
index 7963e7834..60a34f00f 100644
--- a/app/src/main/java/com/futo/circles/model/PeopleListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/PeopleListItem.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.model
+package org.futo.circles.model
-import com.futo.circles.R
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.R
+import org.futo.circles.core.list.IdEntity
sealed class PeopleListItem : IdEntity<String>
diff --git a/app/src/main/java/com/futo/circles/model/Post.kt b/app/src/main/java/org/futo/circles/model/Post.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/model/Post.kt
rename to app/src/main/java/org/futo/circles/model/Post.kt
index ab5a42f16..46dfc9b1c 100644
--- a/app/src/main/java/com/futo/circles/model/Post.kt
+++ b/app/src/main/java/org/futo/circles/model/Post.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.model
+package org.futo.circles.model
-import com.futo.circles.core.list.IdEntity
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.list.IdEntity
+import org.futo.circles.provider.MatrixSessionProvider
sealed class Post(
open val postInfo: PostInfo,
diff --git a/app/src/main/java/com/futo/circles/model/PostContent.kt b/app/src/main/java/org/futo/circles/model/PostContent.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/model/PostContent.kt
rename to app/src/main/java/org/futo/circles/model/PostContent.kt
index 07985515a..e595b757f 100644
--- a/app/src/main/java/com/futo/circles/model/PostContent.kt
+++ b/app/src/main/java/org/futo/circles/model/PostContent.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
import org.matrix.android.sdk.api.session.crypto.attachments.ElementToDecrypt
import org.matrix.android.sdk.api.session.room.model.message.MessageType
diff --git a/app/src/main/java/com/futo/circles/model/PostInfo.kt b/app/src/main/java/org/futo/circles/model/PostInfo.kt
similarity index 89%
rename from app/src/main/java/com/futo/circles/model/PostInfo.kt
rename to app/src/main/java/org/futo/circles/model/PostInfo.kt
index eb0b3795b..b713620a1 100644
--- a/app/src/main/java/com/futo/circles/model/PostInfo.kt
+++ b/app/src/main/java/org/futo/circles/model/PostInfo.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
import org.matrix.android.sdk.api.session.room.sender.SenderInfo
diff --git a/app/src/main/java/com/futo/circles/model/PostItemPayload.kt b/app/src/main/java/org/futo/circles/model/PostItemPayload.kt
similarity index 83%
rename from app/src/main/java/com/futo/circles/model/PostItemPayload.kt
rename to app/src/main/java/org/futo/circles/model/PostItemPayload.kt
index 65134bd68..5e7678bc8 100644
--- a/app/src/main/java/com/futo/circles/model/PostItemPayload.kt
+++ b/app/src/main/java/org/futo/circles/model/PostItemPayload.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
class PostItemPayload(
val repliesCount: Int,
diff --git a/app/src/main/java/com/futo/circles/model/ReactionsData.kt b/app/src/main/java/org/futo/circles/model/ReactionsData.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/model/ReactionsData.kt
rename to app/src/main/java/org/futo/circles/model/ReactionsData.kt
index ec327c77f..2293e8f52 100644
--- a/app/src/main/java/com/futo/circles/model/ReactionsData.kt
+++ b/app/src/main/java/org/futo/circles/model/ReactionsData.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.model
+package org.futo.circles.model
data class ReactionsData(
val key: String,
diff --git a/app/src/main/java/com/futo/circles/model/ReportCategoryListItem.kt b/app/src/main/java/org/futo/circles/model/ReportCategoryListItem.kt
similarity index 65%
rename from app/src/main/java/com/futo/circles/model/ReportCategoryListItem.kt
rename to app/src/main/java/org/futo/circles/model/ReportCategoryListItem.kt
index 99718e0c5..d42a877b8 100644
--- a/app/src/main/java/com/futo/circles/model/ReportCategoryListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/ReportCategoryListItem.kt
@@ -1,6 +1,6 @@
-package com.futo.circles.model
+package org.futo.circles.model
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.core.list.IdEntity
data class ReportCategoryListItem(
override val id: Int,
diff --git a/app/src/main/java/com/futo/circles/model/RoomListItem.kt b/app/src/main/java/org/futo/circles/model/RoomListItem.kt
similarity index 94%
rename from app/src/main/java/com/futo/circles/model/RoomListItem.kt
rename to app/src/main/java/org/futo/circles/model/RoomListItem.kt
index 85260b93f..22dead928 100644
--- a/app/src/main/java/com/futo/circles/model/RoomListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/RoomListItem.kt
@@ -1,6 +1,6 @@
-package com.futo.circles.model
+package org.futo.circles.model
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.core.list.IdEntity
import org.matrix.android.sdk.api.session.room.model.Membership
sealed class RoomListItem(
diff --git a/app/src/main/java/com/futo/circles/model/SelectableRoomListItem.kt b/app/src/main/java/org/futo/circles/model/SelectableRoomListItem.kt
similarity index 65%
rename from app/src/main/java/com/futo/circles/model/SelectableRoomListItem.kt
rename to app/src/main/java/org/futo/circles/model/SelectableRoomListItem.kt
index 120719dbb..2e5fd3718 100644
--- a/app/src/main/java/com/futo/circles/model/SelectableRoomListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/SelectableRoomListItem.kt
@@ -1,6 +1,6 @@
-package com.futo.circles.model
+package org.futo.circles.model
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.core.list.IdEntity
data class SelectableRoomListItem(
override val id: String,
diff --git a/app/src/main/java/com/futo/circles/model/SetupCircleListItem.kt b/app/src/main/java/org/futo/circles/model/SetupCircleListItem.kt
similarity index 70%
rename from app/src/main/java/com/futo/circles/model/SetupCircleListItem.kt
rename to app/src/main/java/org/futo/circles/model/SetupCircleListItem.kt
index 1b41b02ab..32c5ac239 100644
--- a/app/src/main/java/com/futo/circles/model/SetupCircleListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/SetupCircleListItem.kt
@@ -1,7 +1,7 @@
-package com.futo.circles.model
+package org.futo.circles.model
import android.net.Uri
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.core.list.IdEntity
data class SetupCircleListItem(
override val id: Int,
diff --git a/app/src/main/java/com/futo/circles/model/TermsListItem.kt b/app/src/main/java/org/futo/circles/model/TermsListItem.kt
similarity index 66%
rename from app/src/main/java/com/futo/circles/model/TermsListItem.kt
rename to app/src/main/java/org/futo/circles/model/TermsListItem.kt
index 517ae6779..2137c4766 100644
--- a/app/src/main/java/com/futo/circles/model/TermsListItem.kt
+++ b/app/src/main/java/org/futo/circles/model/TermsListItem.kt
@@ -1,6 +1,6 @@
-package com.futo.circles.model
+package org.futo.circles.model
-import com.futo.circles.core.list.IdEntity
+import org.futo.circles.core.list.IdEntity
data class TermsListItem(
override val id: Int,
diff --git a/app/src/main/java/com/futo/circles/provider/MatrixInstanceProvider.kt b/app/src/main/java/org/futo/circles/provider/MatrixInstanceProvider.kt
similarity index 86%
rename from app/src/main/java/com/futo/circles/provider/MatrixInstanceProvider.kt
rename to app/src/main/java/org/futo/circles/provider/MatrixInstanceProvider.kt
index 4589cd2e4..5661940e8 100644
--- a/app/src/main/java/com/futo/circles/provider/MatrixInstanceProvider.kt
+++ b/app/src/main/java/org/futo/circles/provider/MatrixInstanceProvider.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.provider
+package org.futo.circles.provider
import org.matrix.android.sdk.api.Matrix
diff --git a/app/src/main/java/com/futo/circles/provider/MatrixSessionProvider.kt b/app/src/main/java/org/futo/circles/provider/MatrixSessionProvider.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/provider/MatrixSessionProvider.kt
rename to app/src/main/java/org/futo/circles/provider/MatrixSessionProvider.kt
index e21995b41..4df1b1b95 100644
--- a/app/src/main/java/com/futo/circles/provider/MatrixSessionProvider.kt
+++ b/app/src/main/java/org/futo/circles/provider/MatrixSessionProvider.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.provider
+package org.futo.circles.provider
import android.content.Context
import kotlinx.coroutines.suspendCancellableCoroutine
diff --git a/app/src/main/java/com/futo/circles/provider/RoomDisplayNameFallbackProviderImpl.kt b/app/src/main/java/org/futo/circles/provider/RoomDisplayNameFallbackProviderImpl.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/provider/RoomDisplayNameFallbackProviderImpl.kt
rename to app/src/main/java/org/futo/circles/provider/RoomDisplayNameFallbackProviderImpl.kt
index 9f7a99bf9..e0de10de5 100644
--- a/app/src/main/java/com/futo/circles/provider/RoomDisplayNameFallbackProviderImpl.kt
+++ b/app/src/main/java/org/futo/circles/provider/RoomDisplayNameFallbackProviderImpl.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.provider
+package org.futo.circles.provider
import org.matrix.android.sdk.api.RoomDisplayNameFallbackProvider
diff --git a/app/src/main/java/com/futo/circles/view/ActiveSessionInfoView.kt b/app/src/main/java/org/futo/circles/view/ActiveSessionInfoView.kt
similarity index 88%
rename from app/src/main/java/com/futo/circles/view/ActiveSessionInfoView.kt
rename to app/src/main/java/org/futo/circles/view/ActiveSessionInfoView.kt
index f8883a8ea..599577cd8 100644
--- a/app/src/main/java/com/futo/circles/view/ActiveSessionInfoView.kt
+++ b/app/src/main/java/org/futo/circles/view/ActiveSessionInfoView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.view
+package org.futo.circles.view
import android.content.Context
import android.util.AttributeSet
@@ -6,11 +6,11 @@ import android.view.LayoutInflater
import android.widget.ImageView
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.content.ContextCompat
-import com.futo.circles.R
-import com.futo.circles.databinding.ActiveSessionInfoViewBinding
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.feature.settings.active_sessions.list.ActiveSessionClickListener
-import com.futo.circles.model.ActiveSession
+import org.futo.circles.R
+import org.futo.circles.databinding.ActiveSessionInfoViewBinding
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.feature.settings.active_sessions.list.ActiveSessionClickListener
+import org.futo.circles.model.ActiveSession
class ActiveSessionInfoView(
context: Context,
diff --git a/app/src/main/java/com/futo/circles/view/CirclesLogoView.kt b/app/src/main/java/org/futo/circles/view/CirclesLogoView.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/view/CirclesLogoView.kt
rename to app/src/main/java/org/futo/circles/view/CirclesLogoView.kt
index dd715b39a..bf50dd590 100644
--- a/app/src/main/java/com/futo/circles/view/CirclesLogoView.kt
+++ b/app/src/main/java/org/futo/circles/view/CirclesLogoView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.view
+package org.futo.circles.view
import android.content.Context
import android.graphics.*
@@ -7,7 +7,7 @@ import android.view.View
import androidx.annotation.ColorRes
import androidx.core.content.ContextCompat
import androidx.core.graphics.ColorUtils
-import com.futo.circles.R
+import org.futo.circles.R
import kotlin.math.cos
import kotlin.math.min
import kotlin.math.sin
diff --git a/app/src/main/java/com/futo/circles/view/ExpandContentButton.kt b/app/src/main/java/org/futo/circles/view/ExpandContentButton.kt
similarity index 93%
rename from app/src/main/java/com/futo/circles/view/ExpandContentButton.kt
rename to app/src/main/java/org/futo/circles/view/ExpandContentButton.kt
index 86ec45110..0d8cd4303 100644
--- a/app/src/main/java/com/futo/circles/view/ExpandContentButton.kt
+++ b/app/src/main/java/org/futo/circles/view/ExpandContentButton.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.view
+package org.futo.circles.view
import android.content.Context
import android.graphics.drawable.Drawable
import android.util.AttributeSet
-import com.futo.circles.R
-import com.futo.circles.extensions.getAttributes
+import org.futo.circles.R
+import org.futo.circles.extensions.getAttributes
import com.google.android.material.button.MaterialButton
class ExpandContentButton(
diff --git a/app/src/main/java/com/futo/circles/view/GroupPostFooterView.kt b/app/src/main/java/org/futo/circles/view/GroupPostFooterView.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/view/GroupPostFooterView.kt
rename to app/src/main/java/org/futo/circles/view/GroupPostFooterView.kt
index ae0a12ceb..dae29b6d6 100644
--- a/app/src/main/java/com/futo/circles/view/GroupPostFooterView.kt
+++ b/app/src/main/java/org/futo/circles/view/GroupPostFooterView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.view
+package org.futo.circles.view
import android.content.Context
import android.util.AttributeSet
@@ -6,13 +6,13 @@ import android.view.LayoutInflater
import android.widget.LinearLayout
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.content.ContextCompat
-import com.futo.circles.R
-import com.futo.circles.databinding.GroupPostFooterViewBinding
-import com.futo.circles.extensions.getAttributes
-import com.futo.circles.extensions.setIsEncryptedIcon
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.model.Post
-import com.futo.circles.model.ReactionsData
+import org.futo.circles.R
+import org.futo.circles.databinding.GroupPostFooterViewBinding
+import org.futo.circles.extensions.getAttributes
+import org.futo.circles.extensions.setIsEncryptedIcon
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.model.Post
+import org.futo.circles.model.ReactionsData
import com.google.android.material.chip.Chip
import java.text.DateFormat
import java.util.*
diff --git a/app/src/main/java/com/futo/circles/view/GroupPostHeaderView.kt b/app/src/main/java/org/futo/circles/view/GroupPostHeaderView.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/view/GroupPostHeaderView.kt
rename to app/src/main/java/org/futo/circles/view/GroupPostHeaderView.kt
index 598503248..78bf61b38 100644
--- a/app/src/main/java/com/futo/circles/view/GroupPostHeaderView.kt
+++ b/app/src/main/java/org/futo/circles/view/GroupPostHeaderView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.view
+package org.futo.circles.view
import android.annotation.SuppressLint
import android.content.Context
@@ -7,13 +7,13 @@ import android.view.LayoutInflater
import androidx.appcompat.view.menu.MenuBuilder
import androidx.appcompat.widget.PopupMenu
import androidx.constraintlayout.widget.ConstraintLayout
-import com.futo.circles.R
-import com.futo.circles.databinding.GroupPostHeaderViewBinding
-import com.futo.circles.extensions.getAttributes
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.model.ImageContent
-import com.futo.circles.model.Post
+import org.futo.circles.R
+import org.futo.circles.databinding.GroupPostHeaderViewBinding
+import org.futo.circles.extensions.getAttributes
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.model.ImageContent
+import org.futo.circles.model.Post
import org.matrix.android.sdk.api.session.room.powerlevels.Role
class GroupPostHeaderView(
diff --git a/app/src/main/java/com/futo/circles/view/LoadingButton.kt b/app/src/main/java/org/futo/circles/view/LoadingButton.kt
similarity index 89%
rename from app/src/main/java/com/futo/circles/view/LoadingButton.kt
rename to app/src/main/java/org/futo/circles/view/LoadingButton.kt
index 098d6cc4a..00d9c511f 100644
--- a/app/src/main/java/com/futo/circles/view/LoadingButton.kt
+++ b/app/src/main/java/org/futo/circles/view/LoadingButton.kt
@@ -1,14 +1,14 @@
-package com.futo.circles.view
+package org.futo.circles.view
import android.content.Context
import android.util.AttributeSet
import android.util.TypedValue
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
-import com.futo.circles.R
-import com.futo.circles.databinding.LoadingButtonViewBinding
-import com.futo.circles.extensions.getAttributes
-import com.futo.circles.extensions.setIsVisible
+import org.futo.circles.R
+import org.futo.circles.databinding.LoadingButtonViewBinding
+import org.futo.circles.extensions.getAttributes
+import org.futo.circles.extensions.setIsVisible
class LoadingButton(
context: Context,
diff --git a/app/src/main/java/com/futo/circles/view/LoadingView.kt b/app/src/main/java/org/futo/circles/view/LoadingView.kt
similarity index 81%
rename from app/src/main/java/com/futo/circles/view/LoadingView.kt
rename to app/src/main/java/org/futo/circles/view/LoadingView.kt
index 91c494561..d3bd4539e 100644
--- a/app/src/main/java/com/futo/circles/view/LoadingView.kt
+++ b/app/src/main/java/org/futo/circles/view/LoadingView.kt
@@ -1,13 +1,13 @@
-package com.futo.circles.view
+package org.futo.circles.view
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.annotation.StringRes
import androidx.constraintlayout.widget.ConstraintLayout
-import com.futo.circles.model.LoadingData
-import com.futo.circles.databinding.LoadingViewBinding
-import com.futo.circles.extensions.setIsVisible
+import org.futo.circles.model.LoadingData
+import org.futo.circles.databinding.LoadingViewBinding
+import org.futo.circles.extensions.setIsVisible
class LoadingView(
context: Context,
diff --git a/app/src/main/java/com/futo/circles/view/ManageMembersOptionsView.kt b/app/src/main/java/org/futo/circles/view/ManageMembersOptionsView.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/view/ManageMembersOptionsView.kt
rename to app/src/main/java/org/futo/circles/view/ManageMembersOptionsView.kt
index 6d63b1944..cba0c94f2 100644
--- a/app/src/main/java/com/futo/circles/view/ManageMembersOptionsView.kt
+++ b/app/src/main/java/org/futo/circles/view/ManageMembersOptionsView.kt
@@ -1,14 +1,14 @@
-package com.futo.circles.view
+package org.futo.circles.view
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
-import com.futo.circles.databinding.ManageMembersOptionsViewBinding
-import com.futo.circles.extensions.isCurrentUserAbleToBan
-import com.futo.circles.extensions.isCurrentUserAbleToChangeLevelFor
-import com.futo.circles.extensions.isCurrentUserAbleToKick
-import com.futo.circles.extensions.setIsVisible
+import org.futo.circles.databinding.ManageMembersOptionsViewBinding
+import org.futo.circles.extensions.isCurrentUserAbleToBan
+import org.futo.circles.extensions.isCurrentUserAbleToChangeLevelFor
+import org.futo.circles.extensions.isCurrentUserAbleToKick
+import org.futo.circles.extensions.setIsVisible
import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
interface ManageMembersOptionsListener {
diff --git a/app/src/main/java/com/futo/circles/view/PostLayout.kt b/app/src/main/java/org/futo/circles/view/PostLayout.kt
similarity index 93%
rename from app/src/main/java/com/futo/circles/view/PostLayout.kt
rename to app/src/main/java/org/futo/circles/view/PostLayout.kt
index 70e7af7e6..a4bf86ce6 100644
--- a/app/src/main/java/com/futo/circles/view/PostLayout.kt
+++ b/app/src/main/java/org/futo/circles/view/PostLayout.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.view
+package org.futo.circles.view
import android.content.Context
import android.util.AttributeSet
@@ -7,11 +7,11 @@ import android.view.View
import android.view.ViewGroup
import android.widget.FrameLayout
import androidx.constraintlayout.widget.ConstraintLayout
-import com.futo.circles.R
-import com.futo.circles.databinding.PostLayoutBinding
-import com.futo.circles.extensions.gone
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.model.*
+import org.futo.circles.R
+import org.futo.circles.databinding.PostLayoutBinding
+import org.futo.circles.extensions.gone
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.model.*
interface PostOptionsListener {
diff --git a/app/src/main/java/com/futo/circles/view/PreviewPostView.kt b/app/src/main/java/org/futo/circles/view/PreviewPostView.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/view/PreviewPostView.kt
rename to app/src/main/java/org/futo/circles/view/PreviewPostView.kt
index a721794c5..c0c2423ae 100644
--- a/app/src/main/java/com/futo/circles/view/PreviewPostView.kt
+++ b/app/src/main/java/org/futo/circles/view/PreviewPostView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.view
+package org.futo.circles.view
import android.content.Context
@@ -7,11 +7,11 @@ import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.widget.doAfterTextChanged
-import com.futo.circles.R
-import com.futo.circles.databinding.PreviewPostViewBinding
-import com.futo.circles.extensions.getText
-import com.futo.circles.extensions.setIsVisible
-import com.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.R
+import org.futo.circles.databinding.PreviewPostViewBinding
+import org.futo.circles.extensions.getText
+import org.futo.circles.extensions.setIsVisible
+import org.futo.circles.provider.MatrixSessionProvider
import org.matrix.android.sdk.api.session.getUser
import org.matrix.android.sdk.api.session.user.model.User
diff --git a/app/src/main/java/com/futo/circles/view/ProfileView.kt b/app/src/main/java/org/futo/circles/view/ProfileView.kt
similarity index 78%
rename from app/src/main/java/com/futo/circles/view/ProfileView.kt
rename to app/src/main/java/org/futo/circles/view/ProfileView.kt
index 6f0f7a793..e220f0caf 100644
--- a/app/src/main/java/com/futo/circles/view/ProfileView.kt
+++ b/app/src/main/java/org/futo/circles/view/ProfileView.kt
@@ -1,12 +1,12 @@
-package com.futo.circles.view
+package org.futo.circles.view
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
-import com.futo.circles.databinding.ProfileViewBinding
-import com.futo.circles.extensions.loadProfileIcon
-import com.futo.circles.mapping.notEmptyDisplayName
+import org.futo.circles.databinding.ProfileViewBinding
+import org.futo.circles.extensions.loadProfileIcon
+import org.futo.circles.mapping.notEmptyDisplayName
import org.matrix.android.sdk.api.session.user.model.User
class ProfileView(
diff --git a/app/src/main/res/layout/accept_circle_invite_dialog_fragment.xml b/app/src/main/res/layout/accept_circle_invite_dialog_fragment.xml
index fd31b55a4..5acc9e760 100644
--- a/app/src/main/res/layout/accept_circle_invite_dialog_fragment.xml
+++ b/app/src/main/res/layout/accept_circle_invite_dialog_fragment.xml
@@ -18,7 +18,7 @@
app:titleCentered="true"
app:titleMarginEnd="72dp">
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnInvite"
android:layout_width="56dp"
android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/accept_terms_fragment.xml b/app/src/main/res/layout/accept_terms_fragment.xml
index a6df1f295..be5f8f855 100644
--- a/app/src/main/res/layout/accept_terms_fragment.xml
+++ b/app/src/main/res/layout/accept_terms_fragment.xml
@@ -12,7 +12,7 @@
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.3" />
- <com.futo.circles.view.CirclesLogoView
+ <org.futo.circles.view.CirclesLogoView
android:id="@+id/ivLogo"
android:layout_width="0dp"
android:layout_height="0dp"
@@ -62,7 +62,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnAccept"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/active_session_list_item.xml b/app/src/main/res/layout/active_session_list_item.xml
index 744ef3fff..286a80e35 100644
--- a/app/src/main/res/layout/active_session_list_item.xml
+++ b/app/src/main/res/layout/active_session_list_item.xml
@@ -72,7 +72,7 @@
app:layout_constraintTop_toTopOf="@id/ivIcon"
app:tint="@color/blue" />
- <com.futo.circles.view.ActiveSessionInfoView
+ <org.futo.circles.view.ActiveSessionInfoView
android:id="@+id/vInfo"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/change_password_dialog_fragment.xml b/app/src/main/res/layout/change_password_dialog_fragment.xml
index a4ff2fce2..2a232c2a3 100644
--- a/app/src/main/res/layout/change_password_dialog_fragment.xml
+++ b/app/src/main/res/layout/change_password_dialog_fragment.xml
@@ -18,7 +18,7 @@
app:titleCentered="true"
app:titleMarginEnd="72dp">
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnSave"
android:layout_width="56dp"
android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/create_post_bottom_sheet.xml b/app/src/main/res/layout/create_post_bottom_sheet.xml
index a0e61a546..fe33013dd 100644
--- a/app/src/main/res/layout/create_post_bottom_sheet.xml
+++ b/app/src/main/res/layout/create_post_bottom_sheet.xml
@@ -57,7 +57,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnPost" />
- <com.futo.circles.view.PreviewPostView
+ <org.futo.circles.view.PreviewPostView
android:id="@+id/vPostPreview"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/create_room_dialog_fragment.xml b/app/src/main/res/layout/create_room_dialog_fragment.xml
index 4337d131e..97ca65060 100644
--- a/app/src/main/res/layout/create_room_dialog_fragment.xml
+++ b/app/src/main/res/layout/create_room_dialog_fragment.xml
@@ -19,7 +19,7 @@
app:titleMarginEnd="72dp"
tools:title="@string/create_new_group">
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnCreate"
android:layout_width="56dp"
android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/deactivate_account_dialog_fragment.xml b/app/src/main/res/layout/deactivate_account_dialog_fragment.xml
index c9868d04a..ef54d4e95 100644
--- a/app/src/main/res/layout/deactivate_account_dialog_fragment.xml
+++ b/app/src/main/res/layout/deactivate_account_dialog_fragment.xml
@@ -17,7 +17,7 @@
app:title="@string/deactivate_my_account"
app:titleCentered="true">
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnDelete"
android:layout_width="56dp"
android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/edit_profile_dialog_fragment.xml b/app/src/main/res/layout/edit_profile_dialog_fragment.xml
index b4afa9986..69496dfb3 100644
--- a/app/src/main/res/layout/edit_profile_dialog_fragment.xml
+++ b/app/src/main/res/layout/edit_profile_dialog_fragment.xml
@@ -18,7 +18,7 @@
app:titleCentered="true"
app:titleMarginEnd="72dp">
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnSave"
android:layout_width="56dp"
android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/image_post_view.xml b/app/src/main/res/layout/image_post_view.xml
index 92aac0f75..25faed9c6 100644
--- a/app/src/main/res/layout/image_post_view.xml
+++ b/app/src/main/res/layout/image_post_view.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<com.futo.circles.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.futo.circles.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/lImagePost"
android:layout_width="match_parent"
@@ -16,7 +16,7 @@
android:adjustViewBounds="true"
android:src="@drawable/blurred_placeholder" />
- <com.futo.circles.view.LoadingView
+ <org.futo.circles.view.LoadingView
android:id="@+id/vLoadingImage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -29,4 +29,4 @@
</FrameLayout>
-</com.futo.circles.view.PostLayout>
\ No newline at end of file
+</org.futo.circles.view.PostLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/invite_members_dialog_fragment.xml b/app/src/main/res/layout/invite_members_dialog_fragment.xml
index 9252d3c7f..894f284c3 100644
--- a/app/src/main/res/layout/invite_members_dialog_fragment.xml
+++ b/app/src/main/res/layout/invite_members_dialog_fragment.xml
@@ -16,7 +16,7 @@
app:titleCentered="true"
app:titleMarginEnd="72dp">
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnInvite"
android:layout_width="56dp"
android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/loading_dialog.xml b/app/src/main/res/layout/loading_dialog.xml
index 1d9417ae9..e1c843c80 100644
--- a/app/src/main/res/layout/loading_dialog.xml
+++ b/app/src/main/res/layout/loading_dialog.xml
@@ -9,7 +9,7 @@
android:layout_height="wrap_content"
app:cardCornerRadius="12dp">
- <com.futo.circles.view.LoadingView
+ <org.futo.circles.view.LoadingView
android:id="@+id/vLoading"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/log_in_fragment.xml b/app/src/main/res/layout/log_in_fragment.xml
index 1eb24fa55..4b3ed8ad2 100644
--- a/app/src/main/res/layout/log_in_fragment.xml
+++ b/app/src/main/res/layout/log_in_fragment.xml
@@ -16,7 +16,7 @@
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.3" />
- <com.futo.circles.view.CirclesLogoView
+ <org.futo.circles.view.CirclesLogoView
android:id="@+id/ivLogo"
android:layout_width="0dp"
android:layout_height="0dp"
@@ -98,7 +98,7 @@
</com.google.android.material.textfield.TextInputLayout>
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnLogin"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -119,7 +119,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnSignUp"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/member_list_item.xml b/app/src/main/res/layout/member_list_item.xml
index a469a6c96..e25e108cc 100644
--- a/app/src/main/res/layout/member_list_item.xml
+++ b/app/src/main/res/layout/member_list_item.xml
@@ -53,7 +53,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
- <com.futo.circles.view.ManageMembersOptionsView
+ <org.futo.circles.view.ManageMembersOptionsView
android:id="@+id/optionsView"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/post_layout.xml b/app/src/main/res/layout/post_layout.xml
index fc8aa255d..c7f641d0d 100644
--- a/app/src/main/res/layout/post_layout.xml
+++ b/app/src/main/res/layout/post_layout.xml
@@ -51,7 +51,7 @@
android:orientation="horizontal"
app:layout_constraintGuide_begin="8dp" />
- <com.futo.circles.view.GroupPostHeaderView
+ <org.futo.circles.view.GroupPostHeaderView
android:id="@+id/postHeader"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
app:layout_constraintTop_toBottomOf="@id/postHeader" />
- <com.futo.circles.view.GroupPostFooterView
+ <org.futo.circles.view.GroupPostFooterView
android:id="@+id/postFooter"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -84,7 +84,7 @@
</androidx.cardview.widget.CardView>
- <com.futo.circles.view.ExpandContentButton
+ <org.futo.circles.view.ExpandContentButton
android:id="@+id/btnShowReplies"
style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/preview_post_view.xml b/app/src/main/res/layout/preview_post_view.xml
index 3ae763e5b..8e699b854 100644
--- a/app/src/main/res/layout/preview_post_view.xml
+++ b/app/src/main/res/layout/preview_post_view.xml
@@ -28,7 +28,7 @@
android:orientation="horizontal"
app:layout_constraintGuide_begin="8dp" />
- <com.futo.circles.view.GroupPostHeaderView
+ <org.futo.circles.view.GroupPostHeaderView
android:id="@+id/postHeader"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -84,7 +84,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
- <com.futo.circles.view.GroupPostFooterView
+ <org.futo.circles.view.GroupPostFooterView
android:id="@+id/postFooter"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/remove_session_dialog_fragment.xml b/app/src/main/res/layout/remove_session_dialog_fragment.xml
index 737a4326a..369ea0664 100644
--- a/app/src/main/res/layout/remove_session_dialog_fragment.xml
+++ b/app/src/main/res/layout/remove_session_dialog_fragment.xml
@@ -18,7 +18,7 @@
app:title="@string/remove_session"
app:titleCentered="true">
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnRemove"
android:layout_width="56dp"
android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/report_dialog_fragment.xml b/app/src/main/res/layout/report_dialog_fragment.xml
index 9d7a24341..57dff70c6 100644
--- a/app/src/main/res/layout/report_dialog_fragment.xml
+++ b/app/src/main/res/layout/report_dialog_fragment.xml
@@ -19,7 +19,7 @@
app:titleTextAppearance="@style/subheadline"
app:titleTextColor="@color/black">
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnReport"
android:layout_width="56dp"
android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/save_to_gallery_dialog_fragment.xml b/app/src/main/res/layout/save_to_gallery_dialog_fragment.xml
index 2e0f51fef..f9a7f39ce 100644
--- a/app/src/main/res/layout/save_to_gallery_dialog_fragment.xml
+++ b/app/src/main/res/layout/save_to_gallery_dialog_fragment.xml
@@ -18,7 +18,7 @@
app:titleCentered="true"
app:titleMarginEnd="72dp">
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnSave"
android:layout_width="56dp"
android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/select_sign_up_type_fragment.xml b/app/src/main/res/layout/select_sign_up_type_fragment.xml
index 0092a5316..4968ecb59 100644
--- a/app/src/main/res/layout/select_sign_up_type_fragment.xml
+++ b/app/src/main/res/layout/select_sign_up_type_fragment.xml
@@ -13,7 +13,7 @@
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.3" />
- <com.futo.circles.view.CirclesLogoView
+ <org.futo.circles.view.CirclesLogoView
android:id="@+id/ivLogo"
android:layout_width="0dp"
android:layout_height="0dp"
@@ -80,7 +80,7 @@
app:layout_constraintVertical_bias="0.3"
app:layout_constraintVertical_chainStyle="packed" />
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnToken"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml
index 735284657..b52e6296b 100644
--- a/app/src/main/res/layout/settings_fragment.xml
+++ b/app/src/main/res/layout/settings_fragment.xml
@@ -5,7 +5,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <com.futo.circles.view.ProfileView
+ <org.futo.circles.view.ProfileView
android:id="@+id/vUser"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/setup_circles_fragment.xml b/app/src/main/res/layout/setup_circles_fragment.xml
index 80745e91b..497b37dc3 100644
--- a/app/src/main/res/layout/setup_circles_fragment.xml
+++ b/app/src/main/res/layout/setup_circles_fragment.xml
@@ -63,7 +63,7 @@
app:layout_constraintEnd_toEndOf="@id/guidelineEnd"
app:layout_constraintStart_toStartOf="@id/guidelineStart" />
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnSave"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/setup_profile_fragment.xml b/app/src/main/res/layout/setup_profile_fragment.xml
index 3ff134a7a..d20a96718 100644
--- a/app/src/main/res/layout/setup_profile_fragment.xml
+++ b/app/src/main/res/layout/setup_profile_fragment.xml
@@ -99,7 +99,7 @@
</com.google.android.material.textfield.TextInputLayout>
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnSave"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/text_post_view.xml b/app/src/main/res/layout/text_post_view.xml
index fc91bd6b3..038c39d25 100644
--- a/app/src/main/res/layout/text_post_view.xml
+++ b/app/src/main/res/layout/text_post_view.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<com.futo.circles.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.futo.circles.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/lTextPost"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -11,4 +11,4 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/post_text_side_margin" />
-</com.futo.circles.view.PostLayout>
\ No newline at end of file
+</org.futo.circles.view.PostLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/update_room_dialog_fragment.xml b/app/src/main/res/layout/update_room_dialog_fragment.xml
index 893c1cdc1..6a13fd15d 100644
--- a/app/src/main/res/layout/update_room_dialog_fragment.xml
+++ b/app/src/main/res/layout/update_room_dialog_fragment.xml
@@ -19,7 +19,7 @@
app:titleMarginEnd="72dp"
tools:title="@string/configure_group">
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnSave"
android:layout_width="56dp"
android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/validate_email_fragment.xml b/app/src/main/res/layout/validate_email_fragment.xml
index de975c52a..37ee8c1ec 100644
--- a/app/src/main/res/layout/validate_email_fragment.xml
+++ b/app/src/main/res/layout/validate_email_fragment.xml
@@ -21,7 +21,7 @@
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />
- <com.futo.circles.view.CirclesLogoView
+ <org.futo.circles.view.CirclesLogoView
android:id="@+id/ivLogo"
android:layout_width="0dp"
android:layout_height="0dp"
@@ -96,7 +96,7 @@
</com.google.android.material.textfield.TextInputLayout>
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnSendCode"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -109,7 +109,7 @@
app:layout_constraintTop_toBottomOf="@id/tilEmail" />
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnValidate"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/validate_token_fragment.xml b/app/src/main/res/layout/validate_token_fragment.xml
index 9e15099c2..b72319000 100644
--- a/app/src/main/res/layout/validate_token_fragment.xml
+++ b/app/src/main/res/layout/validate_token_fragment.xml
@@ -13,7 +13,7 @@
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.35" />
- <com.futo.circles.view.CirclesLogoView
+ <org.futo.circles.view.CirclesLogoView
android:id="@+id/ivLogo"
android:layout_width="0dp"
android:layout_height="0dp"
@@ -61,7 +61,7 @@
</com.google.android.material.textfield.TextInputLayout>
- <com.futo.circles.view.LoadingButton
+ <org.futo.circles.view.LoadingButton
android:id="@+id/btnValidate"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/navigation/circles_nav_graph.xml b/app/src/main/res/navigation/circles_nav_graph.xml
index 8adf9f785..df1fdc17d 100644
--- a/app/src/main/res/navigation/circles_nav_graph.xml
+++ b/app/src/main/res/navigation/circles_nav_graph.xml
@@ -7,7 +7,7 @@
<fragment
android:id="@+id/circlesFragment"
- android:name="com.futo.circles.feature.circles.CirclesFragment"
+ android:name="org.futo.circles.feature.circles.CirclesFragment"
android:label="@string/my_circles"
tools:layout="@layout/rooms_fragment">
@@ -23,7 +23,7 @@
<argument
android:name="type"
android:defaultValue="Circle"
- app:argType="com.futo.circles.model.CircleRoomTypeArg"
+ app:argType="org.futo.circles.model.CircleRoomTypeArg"
app:nullable="false" />
</action>
@@ -35,7 +35,7 @@
<argument
android:name="type"
android:defaultValue="Circle"
- app:argType="com.futo.circles.model.CircleRoomTypeArg"
+ app:argType="org.futo.circles.model.CircleRoomTypeArg"
app:nullable="false" />
</action>
@@ -55,19 +55,19 @@
<dialog
android:id="@+id/createRoomDialogFragment"
- android:name="com.futo.circles.feature.room.create_room.CreateRoomDialogFragment"
+ android:name="org.futo.circles.feature.room.create_room.CreateRoomDialogFragment"
android:label="CreateCircleDialogFragment"
tools:layout="@layout/create_room_dialog_fragment">
<argument
android:name="type"
- app:argType="com.futo.circles.model.CircleRoomTypeArg"
+ app:argType="org.futo.circles.model.CircleRoomTypeArg"
app:nullable="false" />
</dialog>
<dialog
android:id="@+id/acceptCircleInviteDialogFragment"
- android:name="com.futo.circles.feature.circles.accept_invite.AcceptCircleInviteDialogFragment"
+ android:name="org.futo.circles.feature.circles.accept_invite.AcceptCircleInviteDialogFragment"
android:label="AcceptCircleInviteDialogFragment"
tools:layout="@layout/accept_circle_invite_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 9acb0b6e1..e9b11da50 100644
--- a/app/src/main/res/navigation/groups_nav_graph.xml
+++ b/app/src/main/res/navigation/groups_nav_graph.xml
@@ -7,7 +7,7 @@
<fragment
android:id="@+id/groupsFragment"
- android:name="com.futo.circles.feature.groups.GroupsFragment"
+ android:name="org.futo.circles.feature.groups.GroupsFragment"
android:label="@string/my_groups"
tools:layout="@layout/rooms_fragment">
@@ -23,7 +23,7 @@
<argument
android:name="type"
android:defaultValue="Group"
- app:argType="com.futo.circles.model.CircleRoomTypeArg"
+ app:argType="org.futo.circles.model.CircleRoomTypeArg"
app:nullable="false" />
</action>
@@ -35,7 +35,7 @@
<argument
android:name="type"
android:defaultValue="Group"
- app:argType="com.futo.circles.model.CircleRoomTypeArg"
+ app:argType="org.futo.circles.model.CircleRoomTypeArg"
app:nullable="false" />
</action>
@@ -46,12 +46,12 @@
<dialog
android:id="@+id/createRoomDialogFragment"
- android:name="com.futo.circles.feature.room.create_room.CreateRoomDialogFragment"
+ android:name="org.futo.circles.feature.room.create_room.CreateRoomDialogFragment"
tools:layout="@layout/create_room_dialog_fragment">
<argument
android:name="type"
- app:argType="com.futo.circles.model.CircleRoomTypeArg"
+ app:argType="org.futo.circles.model.CircleRoomTypeArg"
app:nullable="false" />
</dialog>
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 675e4bb82..c1c36ec84 100644
--- a/app/src/main/res/navigation/nav_graph_start_host.xml
+++ b/app/src/main/res/navigation/nav_graph_start_host.xml
@@ -7,7 +7,7 @@
<fragment
android:id="@+id/splashFragment"
- android:name="com.futo.circles.feature.splash.SplashFragment"
+ android:name="org.futo.circles.feature.splash.SplashFragment"
android:label="Splash"
tools:layout="@layout/splash_fragment">
@@ -25,7 +25,7 @@
<fragment
android:id="@+id/logInFragment"
- android:name="com.futo.circles.feature.log_in.LogInFragment"
+ android:name="org.futo.circles.feature.log_in.LogInFragment"
android:label="Log In"
tools:layout="@layout/log_in_fragment">
<action
@@ -40,7 +40,7 @@
<fragment
android:id="@+id/signUpFragment"
- android:name="com.futo.circles.feature.sign_up.SignUpFragment"
+ android:name="org.futo.circles.feature.sign_up.SignUpFragment"
android:label="Sign up"
tools:layout="@layout/sign_up_fragment">
<action
@@ -52,7 +52,7 @@
<fragment
android:id="@+id/bottomNavigationFragment"
- android:name="com.futo.circles.feature.bottom_navigation.BottomNavigationFragment"
+ android:name="org.futo.circles.feature.bottom_navigation.BottomNavigationFragment"
android:label="Bottom Navigation"
tools:layout="@layout/bottom_navigation_fragment">
@@ -65,7 +65,7 @@
</fragment>
<fragment
android:id="@+id/setupProfileFragment"
- android:name="com.futo.circles.feature.sign_up.setup_profile.SetupProfileFragment"
+ android:name="org.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.sign_up.setup_circles.SetupCirclesFragment"
+ android:name="org.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/people_nav_graph.xml b/app/src/main/res/navigation/people_nav_graph.xml
index 2b2857392..a285bbe58 100644
--- a/app/src/main/res/navigation/people_nav_graph.xml
+++ b/app/src/main/res/navigation/people_nav_graph.xml
@@ -7,7 +7,7 @@
<fragment
android:id="@+id/peopleFragment"
- android:name="com.futo.circles.feature.people.PeopleFragment"
+ android:name="org.futo.circles.feature.people.PeopleFragment"
android:label="@string/my_people"
tools:layout="@layout/people_fragment">
<action
@@ -24,7 +24,7 @@
<fragment
android:id="@+id/userFragment"
- android:name="com.futo.circles.feature.people.user.UserFragment"
+ android:name="org.futo.circles.feature.people.user.UserFragment"
tools:layout="@layout/user_fragment">
<argument
diff --git a/app/src/main/res/navigation/photos_nav_graph.xml b/app/src/main/res/navigation/photos_nav_graph.xml
index f60684129..e78349add 100644
--- a/app/src/main/res/navigation/photos_nav_graph.xml
+++ b/app/src/main/res/navigation/photos_nav_graph.xml
@@ -7,7 +7,7 @@
<fragment
android:id="@+id/photosFragment"
- android:name="com.futo.circles.feature.photos.PhotosFragment"
+ android:name="org.futo.circles.feature.photos.PhotosFragment"
android:label="@string/photo_galleries"
tools:layout="@layout/rooms_fragment">
@@ -18,7 +18,7 @@
<argument
android:name="type"
android:defaultValue="Photo"
- app:argType="com.futo.circles.model.CircleRoomTypeArg"
+ app:argType="org.futo.circles.model.CircleRoomTypeArg"
app:nullable="false" />
</action>
@@ -36,19 +36,19 @@
<dialog
android:id="@+id/createRoomDialogFragment"
- android:name="com.futo.circles.feature.room.create_room.CreateRoomDialogFragment"
+ android:name="org.futo.circles.feature.room.create_room.CreateRoomDialogFragment"
tools:layout="@layout/create_room_dialog_fragment">
<argument
android:name="type"
- app:argType="com.futo.circles.model.CircleRoomTypeArg"
+ app:argType="org.futo.circles.model.CircleRoomTypeArg"
app:nullable="false" />
</dialog>
<fragment
android:id="@+id/galleryFragment"
- android:name="com.futo.circles.feature.photos.gallery.GalleryFragment"
+ android:name="org.futo.circles.feature.photos.gallery.GalleryFragment"
tools:layout="@layout/gallery_fragment">
<argument
@@ -68,7 +68,7 @@
<argument
android:name="type"
android:defaultValue="Photo"
- app:argType="com.futo.circles.model.CircleRoomTypeArg"
+ app:argType="org.futo.circles.model.CircleRoomTypeArg"
app:nullable="false" />
</action>
@@ -93,7 +93,7 @@
<dialog
android:id="@+id/updateRoomDialogFragment"
- android:name="com.futo.circles.feature.room.update_room.UpdateRoomDialogFragment"
+ android:name="org.futo.circles.feature.room.update_room.UpdateRoomDialogFragment"
tools:layout="@layout/update_room_dialog_fragment">
<argument
@@ -103,14 +103,14 @@
<argument
android:name="type"
- app:argType="com.futo.circles.model.CircleRoomTypeArg"
+ app:argType="org.futo.circles.model.CircleRoomTypeArg"
app:nullable="false" />
</dialog>
<dialog
android:id="@+id/galleryImageDialogFragment"
- android:name="com.futo.circles.feature.photos.preview.GalleryImageDialogFragment"
+ android:name="org.futo.circles.feature.photos.preview.GalleryImageDialogFragment"
tools:layout="@layout/gallery_image_dialog_fragment">
<argument
diff --git a/app/src/main/res/navigation/settings_nav_graph.xml b/app/src/main/res/navigation/settings_nav_graph.xml
index 4170d8207..d27d1b0e5 100644
--- a/app/src/main/res/navigation/settings_nav_graph.xml
+++ b/app/src/main/res/navigation/settings_nav_graph.xml
@@ -7,7 +7,7 @@
<fragment
android:id="@+id/settingsFragment"
- android:name="com.futo.circles.feature.settings.SettingsFragment"
+ android:name="org.futo.circles.feature.settings.SettingsFragment"
android:label="@string/settings"
tools:layout="@layout/settings_fragment">
<action
@@ -26,22 +26,22 @@
<dialog
android:id="@+id/editProfileDialogFragment"
- android:name="com.futo.circles.feature.settings.edit_profile.EditProfileDialogFragment"
+ android:name="org.futo.circles.feature.settings.edit_profile.EditProfileDialogFragment"
android:label="ProfileDialogFragment"
tools:layout="@layout/edit_profile_dialog_fragment" />
<dialog
android:id="@+id/changePasswordDialogFragment"
- android:name="com.futo.circles.feature.settings.change_password.ChangePasswordDialogFragment"
+ android:name="org.futo.circles.feature.settings.change_password.ChangePasswordDialogFragment"
android:label="ChangePasswordDialogFragment"
tools:layout="@layout/change_password_dialog_fragment" />
<dialog
android:id="@+id/deactivateAccountDialogFragment"
- android:name="com.futo.circles.feature.settings.deactivate.DeactivateAccountDialogFragment"
+ android:name="org.futo.circles.feature.settings.deactivate.DeactivateAccountDialogFragment"
android:label="DeactivateAccountDialogFragment"
tools:layout="@layout/deactivate_account_dialog_fragment" />
<dialog
android:id="@+id/activeSessionsDialogFragment"
- android:name="com.futo.circles.feature.settings.active_sessions.ActiveSessionsDialogFragment"
+ android:name="org.futo.circles.feature.settings.active_sessions.ActiveSessionsDialogFragment"
android:label="ActiveSessionsDialogFragment"
tools:layout="@layout/active_sessions_dialog_fragment">
<action
@@ -57,7 +57,7 @@
</dialog>
<dialog
android:id="@+id/removeSessionDialogFragment"
- android:name="com.futo.circles.feature.settings.active_sessions.remove_session.RemoveSessionDialogFragment"
+ android:name="org.futo.circles.feature.settings.active_sessions.remove_session.RemoveSessionDialogFragment"
android:label="RemoveSessionDialogFragment"
tools:layout="@layout/remove_session_dialog_fragment">
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 d2641d76c..872fd83f1 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.sign_up_type.SelectSignUpTypeFragment"
+ android:name="org.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.sign_up.validate_token.ValidateTokenFragment"
+ android:name="org.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.sign_up.validate_email.ValidateEmailFragment"
+ android:name="org.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.sign_up.terms.AcceptTermsFragment"
+ android:name="org.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 70355f70c..0ab6e1287 100644
--- a/app/src/main/res/navigation/timeline_nav_graph.xml
+++ b/app/src/main/res/navigation/timeline_nav_graph.xml
@@ -8,7 +8,7 @@
<fragment
android:id="@+id/timelineFragment"
- android:name="com.futo.circles.feature.timeline.TimelineFragment"
+ android:name="org.futo.circles.feature.timeline.TimelineFragment"
tools:layout="@layout/timeline_fragment">
<argument
@@ -18,7 +18,7 @@
<argument
android:name="type"
- app:argType="com.futo.circles.model.CircleRoomTypeArg"
+ app:argType="org.futo.circles.model.CircleRoomTypeArg"
app:nullable="false" />
<action
@@ -42,7 +42,7 @@
<argument
android:name="type"
- app:argType="com.futo.circles.model.CircleRoomTypeArg"
+ app:argType="org.futo.circles.model.CircleRoomTypeArg"
app:nullable="false" />
</action>
@@ -57,7 +57,7 @@
<argument
android:name="type"
- app:argType="com.futo.circles.model.CircleRoomTypeArg"
+ app:argType="org.futo.circles.model.CircleRoomTypeArg"
app:nullable="false" />
</action>
@@ -141,7 +141,7 @@
<dialog
android:id="@+id/inviteMembersDialogFragment"
- android:name="com.futo.circles.feature.room.invite.InviteMembersDialogFragment"
+ android:name="org.futo.circles.feature.room.invite.InviteMembersDialogFragment"
tools:layout="@layout/invite_members_dialog_fragment">
<argument
@@ -153,7 +153,7 @@
<dialog
android:id="@+id/manageMembersDialogFragment"
- android:name="com.futo.circles.feature.room.manage_members.ManageMembersDialogFragment"
+ android:name="org.futo.circles.feature.room.manage_members.ManageMembersDialogFragment"
tools:layout="@layout/manage_members_dialog_fragment">
<argument
@@ -163,7 +163,7 @@
<argument
android:name="type"
- app:argType="com.futo.circles.model.CircleRoomTypeArg"
+ app:argType="org.futo.circles.model.CircleRoomTypeArg"
app:nullable="false" />
<action
@@ -190,7 +190,7 @@
</dialog>
<dialog
android:id="@+id/changeAccessLevelBottomSheet"
- android:name="com.futo.circles.feature.room.manage_members.change_role.ChangeAccessLevelBottomSheet"
+ android:name="org.futo.circles.feature.room.manage_members.change_role.ChangeAccessLevelBottomSheet"
android:label="ChangeAccessLevelBottomSheet"
tools:layout="@layout/change_access_level_bottom_sheet">
@@ -212,7 +212,7 @@
</dialog>
<dialog
android:id="@+id/updateRoomDialogFragment"
- android:name="com.futo.circles.feature.room.update_room.UpdateRoomDialogFragment"
+ android:name="org.futo.circles.feature.room.update_room.UpdateRoomDialogFragment"
android:label="UpdateRoomDialogFragment"
tools:layout="@layout/update_room_dialog_fragment">
@@ -223,14 +223,14 @@
<argument
android:name="type"
- app:argType="com.futo.circles.model.CircleRoomTypeArg"
+ app:argType="org.futo.circles.model.CircleRoomTypeArg"
app:nullable="false" />
</dialog>
<dialog
android:id="@+id/createPostBottomSheet"
- android:name="com.futo.circles.feature.timeline.post.CreatePostBottomSheet"
+ android:name="org.futo.circles.feature.timeline.post.CreatePostBottomSheet"
android:label="CreatePostBottomSheet"
tools:layout="@layout/create_post_bottom_sheet">
@@ -252,7 +252,7 @@
</dialog>
<dialog
android:id="@+id/reportDialogFragment"
- android:name="com.futo.circles.feature.timeline.post.report.ReportDialogFragment"
+ android:name="org.futo.circles.feature.timeline.post.report.ReportDialogFragment"
android:label="ReportDialogFragment"
tools:layout="@layout/report_dialog_fragment">
@@ -269,7 +269,7 @@
</dialog>
<dialog
android:id="@+id/emojiBottomSheet"
- android:name="com.futo.circles.feature.timeline.post.emoji.EmojiBottomSheet"
+ android:name="org.futo.circles.feature.timeline.post.emoji.EmojiBottomSheet"
android:label="EmojiBottomSheet"
tools:layout="@layout/emoji_bottom_sheet">
@@ -286,7 +286,7 @@
</dialog>
<dialog
android:id="@+id/followingDialogFragment"
- android:name="com.futo.circles.feature.circles.following.FollowingDialogFragment"
+ android:name="org.futo.circles.feature.circles.following.FollowingDialogFragment"
android:label="FollowingDialogFragment"
tools:layout="@layout/following_dialog_fragment">
@@ -298,7 +298,7 @@
</dialog>
<dialog
android:id="@+id/saveToGalleyDialogFragment"
- android:name="com.futo.circles.feature.photos.save.SaveToGalleyDialogFragment"
+ android:name="org.futo.circles.feature.photos.save.SaveToGalleyDialogFragment"
tools:layout="@layout/save_to_gallery_dialog_fragment">
<argument
diff --git a/app/src/test/java/com/futo/circles/ExampleUnitTest.kt b/app/src/test/java/org/futo/circles/ExampleUnitTest.kt
similarity index 92%
rename from app/src/test/java/com/futo/circles/ExampleUnitTest.kt
rename to app/src/test/java/org/futo/circles/ExampleUnitTest.kt
index d55847b1c..32c96263a 100644
--- a/app/src/test/java/com/futo/circles/ExampleUnitTest.kt
+++ b/app/src/test/java/org/futo/circles/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.futo.circles
+package org.futo.circles
import org.junit.Test
--
GitLab