From 0d0fecf9c45003eb6206ba605a4229a6713ffc55 Mon Sep 17 00:00:00 2001
From: Taras <tarassmakula@gmail.com>
Date: Tue, 1 Mar 2022 13:36:45 +0200
Subject: [PATCH] Rename ui to feature
---
.../com/futo/circles/di/DataSourceModule.kt | 8 ++---
.../main/java/com/futo/circles/di/UiModule.kt | 8 ++---
.../BottomNavigationFragment.kt | 2 +-
.../circles/CirclesFragment.kt | 2 +-
.../{ui => feature}/groups/GroupsFragment.kt | 4 +--
.../{ui => feature}/groups/GroupsViewModel.kt | 2 +-
.../groups/list/GroupViewHolder.kt | 2 +-
.../groups/list/GroupsListAdapter.kt | 2 +-
.../groups/timeline/GroupTimelineFragment.kt | 8 ++---
.../groups/timeline/GroupTimelineViewModel.kt | 4 +--
.../data_source/GroupTimelineBuilder.kt | 2 +-
.../data_source/GroupTimelineDatasource.kt | 2 +-
.../invite/InviteMembersDialogFragment.kt | 4 +--
.../timeline/invite/InviteMembersViewModel.kt | 4 +--
.../data_source/InviteMembersDataSource.kt | 2 +-
.../timeline/list/GroupTimelineAdapter.kt | 5 ++-
.../timeline/list/GroupTimelineViewHolder.kt | 6 ++--
.../{ui => feature}/home/HomeFragment.kt | 2 +-
.../{ui => feature}/log_in/LogInFragment.kt | 2 +-
.../{ui => feature}/log_in/LogInViewModel.kt | 4 +--
.../log_in/data_source/LoginDataSource.kt | 2 +-
.../{ui => feature}/people/PeopleFragment.kt | 2 +-
.../{ui => feature}/photos/PhotosFragment.kt | 2 +-
.../{ui => feature}/sign_up/SignUpFragment.kt | 2 +-
.../view/AdvancedOptionsView.kt | 6 +---
.../{ui => feature}/view/CirclesLogoView.kt | 2 +-
.../view/ExpandContentButton.kt | 2 +-
.../view/GroupPostFooterView.kt | 2 +-
.../view/GroupPostHeaderView.kt | 2 +-
.../{ui => feature}/view/LoadingButton.kt | 2 +-
.../{ui => feature}/view/PostLayout.kt | 3 +-
.../main/res/layout/advanced_options_view.xml | 2 +-
app/src/main/res/layout/circles_fragment.xml | 2 +-
app/src/main/res/layout/image_post_view.xml | 4 +--
.../layout/invite_members_dialog_fragment.xml | 34 +++++++++++++++----
app/src/main/res/layout/log_in_fragment.xml | 8 ++---
app/src/main/res/layout/post_layout.xml | 6 ++--
app/src/main/res/layout/text_post_view.xml | 4 +--
.../main/res/navigation/groups_nav_graph.xml | 6 ++--
.../res/navigation/nav_graph_bottom_menu.xml | 8 ++---
.../res/navigation/nav_graph_start_host.xml | 6 ++--
app/src/main/res/values/strings.xml | 2 +-
42 files changed, 99 insertions(+), 85 deletions(-)
rename app/src/main/java/com/futo/circles/{ui => feature}/bottom_navigation/BottomNavigationFragment.kt (96%)
rename app/src/main/java/com/futo/circles/{ui => feature}/circles/CirclesFragment.kt (75%)
rename app/src/main/java/com/futo/circles/{ui => feature}/groups/GroupsFragment.kt (93%)
rename app/src/main/java/com/futo/circles/{ui => feature}/groups/GroupsViewModel.kt (92%)
rename app/src/main/java/com/futo/circles/{ui => feature}/groups/list/GroupViewHolder.kt (97%)
rename app/src/main/java/com/futo/circles/{ui => feature}/groups/list/GroupsListAdapter.kt (96%)
rename app/src/main/java/com/futo/circles/{ui => feature}/groups/timeline/GroupTimelineFragment.kt (92%)
rename app/src/main/java/com/futo/circles/{ui => feature}/groups/timeline/GroupTimelineViewModel.kt (82%)
rename app/src/main/java/com/futo/circles/{ui => feature}/groups/timeline/data_source/GroupTimelineBuilder.kt (98%)
rename app/src/main/java/com/futo/circles/{ui => feature}/groups/timeline/data_source/GroupTimelineDatasource.kt (96%)
rename app/src/main/java/com/futo/circles/{ui => feature}/groups/timeline/invite/InviteMembersDialogFragment.kt (91%)
rename app/src/main/java/com/futo/circles/{ui => feature}/groups/timeline/invite/InviteMembersViewModel.kt (63%)
rename app/src/main/java/com/futo/circles/{ui => feature}/groups/timeline/invite/data_source/InviteMembersDataSource.kt (89%)
rename app/src/main/java/com/futo/circles/{ui => feature}/groups/timeline/list/GroupTimelineAdapter.kt (91%)
rename app/src/main/java/com/futo/circles/{ui => feature}/groups/timeline/list/GroupTimelineViewHolder.kt (93%)
rename app/src/main/java/com/futo/circles/{ui => feature}/home/HomeFragment.kt (75%)
rename app/src/main/java/com/futo/circles/{ui => feature}/log_in/LogInFragment.kt (98%)
rename app/src/main/java/com/futo/circles/{ui => feature}/log_in/LogInViewModel.kt (85%)
rename app/src/main/java/com/futo/circles/{ui => feature}/log_in/data_source/LoginDataSource.kt (95%)
rename app/src/main/java/com/futo/circles/{ui => feature}/people/PeopleFragment.kt (75%)
rename app/src/main/java/com/futo/circles/{ui => feature}/photos/PhotosFragment.kt (75%)
rename app/src/main/java/com/futo/circles/{ui => feature}/sign_up/SignUpFragment.kt (90%)
rename app/src/main/java/com/futo/circles/{ui => feature}/view/AdvancedOptionsView.kt (84%)
rename app/src/main/java/com/futo/circles/{ui => feature}/view/CirclesLogoView.kt (98%)
rename app/src/main/java/com/futo/circles/{ui => feature}/view/ExpandContentButton.kt (97%)
rename app/src/main/java/com/futo/circles/{ui => feature}/view/GroupPostFooterView.kt (96%)
rename app/src/main/java/com/futo/circles/{ui => feature}/view/GroupPostHeaderView.kt (96%)
rename app/src/main/java/com/futo/circles/{ui => feature}/view/LoadingButton.kt (97%)
rename app/src/main/java/com/futo/circles/{ui => feature}/view/PostLayout.kt (96%)
diff --git a/app/src/main/java/com/futo/circles/di/DataSourceModule.kt b/app/src/main/java/com/futo/circles/di/DataSourceModule.kt
index 4d058aa7d..c2bf193da 100644
--- a/app/src/main/java/com/futo/circles/di/DataSourceModule.kt
+++ b/app/src/main/java/com/futo/circles/di/DataSourceModule.kt
@@ -1,9 +1,9 @@
package com.futo.circles.di
-import com.futo.circles.ui.groups.timeline.data_source.GroupTimelineBuilder
-import com.futo.circles.ui.groups.timeline.data_source.GroupTimelineDatasource
-import com.futo.circles.ui.groups.timeline.invite.data_source.InviteMembersDataSource
-import com.futo.circles.ui.log_in.data_source.LoginDataSource
+import com.futo.circles.feature.groups.timeline.data_source.GroupTimelineBuilder
+import com.futo.circles.feature.groups.timeline.data_source.GroupTimelineDatasource
+import com.futo.circles.feature.groups.timeline.invite.data_source.InviteMembersDataSource
+import com.futo.circles.feature.log_in.data_source.LoginDataSource
import org.koin.dsl.module
val dataSourceModule = module {
diff --git a/app/src/main/java/com/futo/circles/di/UiModule.kt b/app/src/main/java/com/futo/circles/di/UiModule.kt
index ab3497df8..daf830fd4 100644
--- a/app/src/main/java/com/futo/circles/di/UiModule.kt
+++ b/app/src/main/java/com/futo/circles/di/UiModule.kt
@@ -1,9 +1,9 @@
package com.futo.circles.di
-import com.futo.circles.ui.groups.GroupsViewModel
-import com.futo.circles.ui.groups.timeline.GroupTimelineViewModel
-import com.futo.circles.ui.groups.timeline.invite.InviteMembersViewModel
-import com.futo.circles.ui.log_in.LogInViewModel
+import com.futo.circles.feature.groups.GroupsViewModel
+import com.futo.circles.feature.groups.timeline.GroupTimelineViewModel
+import com.futo.circles.feature.groups.timeline.invite.InviteMembersViewModel
+import com.futo.circles.feature.log_in.LogInViewModel
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/ui/bottom_navigation/BottomNavigationFragment.kt b/app/src/main/java/com/futo/circles/feature/bottom_navigation/BottomNavigationFragment.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/ui/bottom_navigation/BottomNavigationFragment.kt
rename to app/src/main/java/com/futo/circles/feature/bottom_navigation/BottomNavigationFragment.kt
index 5a3a49d6d..c12c3ed11 100644
--- a/app/src/main/java/com/futo/circles/ui/bottom_navigation/BottomNavigationFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/bottom_navigation/BottomNavigationFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.bottom_navigation
+package com.futo.circles.feature.bottom_navigation
import android.os.Bundle
import android.view.View
diff --git a/app/src/main/java/com/futo/circles/ui/circles/CirclesFragment.kt b/app/src/main/java/com/futo/circles/feature/circles/CirclesFragment.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/ui/circles/CirclesFragment.kt
rename to app/src/main/java/com/futo/circles/feature/circles/CirclesFragment.kt
index 794eca6e8..c0fd3e045 100644
--- a/app/src/main/java/com/futo/circles/ui/circles/CirclesFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/circles/CirclesFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.circles
+package com.futo.circles.feature.circles
import androidx.fragment.app.Fragment
import com.futo.circles.R
diff --git a/app/src/main/java/com/futo/circles/ui/groups/GroupsFragment.kt b/app/src/main/java/com/futo/circles/feature/groups/GroupsFragment.kt
similarity index 93%
rename from app/src/main/java/com/futo/circles/ui/groups/GroupsFragment.kt
rename to app/src/main/java/com/futo/circles/feature/groups/GroupsFragment.kt
index 171f830e8..cf4983431 100644
--- a/app/src/main/java/com/futo/circles/ui/groups/GroupsFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/groups/GroupsFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.groups
+package com.futo.circles.feature.groups
import android.os.Bundle
import android.view.View
@@ -10,7 +10,7 @@ import com.futo.circles.R
import com.futo.circles.databinding.GroupsFragmentBinding
import com.futo.circles.extensions.observeData
import com.futo.circles.model.GroupListItem
-import com.futo.circles.ui.groups.list.GroupsListAdapter
+import com.futo.circles.feature.groups.list.GroupsListAdapter
import org.koin.androidx.viewmodel.ext.android.viewModel
diff --git a/app/src/main/java/com/futo/circles/ui/groups/GroupsViewModel.kt b/app/src/main/java/com/futo/circles/feature/groups/GroupsViewModel.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/ui/groups/GroupsViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/groups/GroupsViewModel.kt
index 60bd6f9f5..a8fd123bb 100644
--- a/app/src/main/java/com/futo/circles/ui/groups/GroupsViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/groups/GroupsViewModel.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.groups
+package com.futo.circles.feature.groups
import androidx.lifecycle.ViewModel
import androidx.lifecycle.map
diff --git a/app/src/main/java/com/futo/circles/ui/groups/list/GroupViewHolder.kt b/app/src/main/java/com/futo/circles/feature/groups/list/GroupViewHolder.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/ui/groups/list/GroupViewHolder.kt
rename to app/src/main/java/com/futo/circles/feature/groups/list/GroupViewHolder.kt
index e0e77770b..aeea2aeb8 100644
--- a/app/src/main/java/com/futo/circles/ui/groups/list/GroupViewHolder.kt
+++ b/app/src/main/java/com/futo/circles/feature/groups/list/GroupViewHolder.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.groups.list
+package com.futo.circles.feature.groups.list
import android.text.format.DateUtils
import android.util.Size
diff --git a/app/src/main/java/com/futo/circles/ui/groups/list/GroupsListAdapter.kt b/app/src/main/java/com/futo/circles/feature/groups/list/GroupsListAdapter.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/ui/groups/list/GroupsListAdapter.kt
rename to app/src/main/java/com/futo/circles/feature/groups/list/GroupsListAdapter.kt
index b64f53c51..4862a3f05 100644
--- a/app/src/main/java/com/futo/circles/ui/groups/list/GroupsListAdapter.kt
+++ b/app/src/main/java/com/futo/circles/feature/groups/list/GroupsListAdapter.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.groups.list
+package com.futo.circles.feature.groups.list
import android.view.ViewGroup
import com.futo.circles.base.BaseRvAdapter
diff --git a/app/src/main/java/com/futo/circles/ui/groups/timeline/GroupTimelineFragment.kt b/app/src/main/java/com/futo/circles/feature/groups/timeline/GroupTimelineFragment.kt
similarity index 92%
rename from app/src/main/java/com/futo/circles/ui/groups/timeline/GroupTimelineFragment.kt
rename to app/src/main/java/com/futo/circles/feature/groups/timeline/GroupTimelineFragment.kt
index b679d05c2..b721b89ab 100644
--- a/app/src/main/java/com/futo/circles/ui/groups/timeline/GroupTimelineFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/groups/timeline/GroupTimelineFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.groups.timeline
+package com.futo.circles.feature.groups.timeline
import android.annotation.SuppressLint
import android.os.Bundle
@@ -19,9 +19,9 @@ import com.futo.circles.extensions.dimen
import com.futo.circles.extensions.observeData
import com.futo.circles.extensions.setToolbarTitle
import com.futo.circles.model.Post
-import com.futo.circles.ui.groups.timeline.list.GroupPostViewHolder
-import com.futo.circles.ui.groups.timeline.list.GroupTimelineAdapter
-import com.futo.circles.ui.view.GroupPostListener
+import com.futo.circles.feature.groups.timeline.list.GroupPostViewHolder
+import com.futo.circles.feature.groups.timeline.list.GroupTimelineAdapter
+import com.futo.circles.feature.view.GroupPostListener
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf
diff --git a/app/src/main/java/com/futo/circles/ui/groups/timeline/GroupTimelineViewModel.kt b/app/src/main/java/com/futo/circles/feature/groups/timeline/GroupTimelineViewModel.kt
similarity index 82%
rename from app/src/main/java/com/futo/circles/ui/groups/timeline/GroupTimelineViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/groups/timeline/GroupTimelineViewModel.kt
index ae6997c8b..4f0e90b19 100644
--- a/app/src/main/java/com/futo/circles/ui/groups/timeline/GroupTimelineViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/groups/timeline/GroupTimelineViewModel.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.ui.groups.timeline
+package com.futo.circles.feature.groups.timeline
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
-import com.futo.circles.ui.groups.timeline.data_source.GroupTimelineDatasource
+import com.futo.circles.feature.groups.timeline.data_source.GroupTimelineDatasource
class GroupTimelineViewModel(
private val dataSource: GroupTimelineDatasource
diff --git a/app/src/main/java/com/futo/circles/ui/groups/timeline/data_source/GroupTimelineBuilder.kt b/app/src/main/java/com/futo/circles/feature/groups/timeline/data_source/GroupTimelineBuilder.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/ui/groups/timeline/data_source/GroupTimelineBuilder.kt
rename to app/src/main/java/com/futo/circles/feature/groups/timeline/data_source/GroupTimelineBuilder.kt
index 0a51eb62d..8cdbd2171 100644
--- a/app/src/main/java/com/futo/circles/ui/groups/timeline/data_source/GroupTimelineBuilder.kt
+++ b/app/src/main/java/com/futo/circles/feature/groups/timeline/data_source/GroupTimelineBuilder.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.groups.timeline.data_source
+package com.futo.circles.feature.groups.timeline.data_source
import com.futo.circles.mapping.toPost
import com.futo.circles.model.Post
diff --git a/app/src/main/java/com/futo/circles/ui/groups/timeline/data_source/GroupTimelineDatasource.kt b/app/src/main/java/com/futo/circles/feature/groups/timeline/data_source/GroupTimelineDatasource.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/ui/groups/timeline/data_source/GroupTimelineDatasource.kt
rename to app/src/main/java/com/futo/circles/feature/groups/timeline/data_source/GroupTimelineDatasource.kt
index ddf9b2fef..c1c63574a 100644
--- a/app/src/main/java/com/futo/circles/ui/groups/timeline/data_source/GroupTimelineDatasource.kt
+++ b/app/src/main/java/com/futo/circles/feature/groups/timeline/data_source/GroupTimelineDatasource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.groups.timeline.data_source
+package com.futo.circles.feature.groups.timeline.data_source
import androidx.lifecycle.MutableLiveData
import com.futo.circles.extensions.nameOrId
diff --git a/app/src/main/java/com/futo/circles/ui/groups/timeline/invite/InviteMembersDialogFragment.kt b/app/src/main/java/com/futo/circles/feature/groups/timeline/invite/InviteMembersDialogFragment.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/ui/groups/timeline/invite/InviteMembersDialogFragment.kt
rename to app/src/main/java/com/futo/circles/feature/groups/timeline/invite/InviteMembersDialogFragment.kt
index 6381b4cb8..268ff2d9d 100644
--- a/app/src/main/java/com/futo/circles/ui/groups/timeline/invite/InviteMembersDialogFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/groups/timeline/invite/InviteMembersDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.groups.timeline.invite
+package com.futo.circles.feature.groups.timeline.invite
import android.os.Bundle
import android.view.View
@@ -7,7 +7,7 @@ import com.futo.circles.R
import com.futo.circles.base.BaseFullscreenDialogFragment
import com.futo.circles.databinding.InviteMembersDialogFragmentBinding
import com.futo.circles.extensions.observeData
-import com.futo.circles.ui.groups.timeline.GroupTimelineFragmentArgs
+import com.futo.circles.feature.groups.timeline.GroupTimelineFragmentArgs
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf
diff --git a/app/src/main/java/com/futo/circles/ui/groups/timeline/invite/InviteMembersViewModel.kt b/app/src/main/java/com/futo/circles/feature/groups/timeline/invite/InviteMembersViewModel.kt
similarity index 63%
rename from app/src/main/java/com/futo/circles/ui/groups/timeline/invite/InviteMembersViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/groups/timeline/invite/InviteMembersViewModel.kt
index 60ceb2d1a..edbc0ee33 100644
--- a/app/src/main/java/com/futo/circles/ui/groups/timeline/invite/InviteMembersViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/groups/timeline/invite/InviteMembersViewModel.kt
@@ -1,8 +1,8 @@
-package com.futo.circles.ui.groups.timeline.invite
+package com.futo.circles.feature.groups.timeline.invite
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
-import com.futo.circles.ui.groups.timeline.invite.data_source.InviteMembersDataSource
+import com.futo.circles.feature.groups.timeline.invite.data_source.InviteMembersDataSource
class InviteMembersViewModel(
private val dataSource: InviteMembersDataSource
diff --git a/app/src/main/java/com/futo/circles/ui/groups/timeline/invite/data_source/InviteMembersDataSource.kt b/app/src/main/java/com/futo/circles/feature/groups/timeline/invite/data_source/InviteMembersDataSource.kt
similarity index 89%
rename from app/src/main/java/com/futo/circles/ui/groups/timeline/invite/data_source/InviteMembersDataSource.kt
rename to app/src/main/java/com/futo/circles/feature/groups/timeline/invite/data_source/InviteMembersDataSource.kt
index 4073535e8..1d44a6e82 100644
--- a/app/src/main/java/com/futo/circles/ui/groups/timeline/invite/data_source/InviteMembersDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/groups/timeline/invite/data_source/InviteMembersDataSource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.groups.timeline.invite.data_source
+package com.futo.circles.feature.groups.timeline.invite.data_source
import android.content.Context
import com.futo.circles.R
diff --git a/app/src/main/java/com/futo/circles/ui/groups/timeline/list/GroupTimelineAdapter.kt b/app/src/main/java/com/futo/circles/feature/groups/timeline/list/GroupTimelineAdapter.kt
similarity index 91%
rename from app/src/main/java/com/futo/circles/ui/groups/timeline/list/GroupTimelineAdapter.kt
rename to app/src/main/java/com/futo/circles/feature/groups/timeline/list/GroupTimelineAdapter.kt
index 0f5d6a1ff..f3e933048 100644
--- a/app/src/main/java/com/futo/circles/ui/groups/timeline/list/GroupTimelineAdapter.kt
+++ b/app/src/main/java/com/futo/circles/feature/groups/timeline/list/GroupTimelineAdapter.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.groups.timeline.list
+package com.futo.circles.feature.groups.timeline.list
import android.view.ViewGroup
import com.futo.circles.base.BaseRvAdapter
@@ -6,8 +6,7 @@ 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.ui.view.GroupPostListener
-import org.matrix.android.sdk.api.session.content.ContentUrlResolver
+import com.futo.circles.feature.view.GroupPostListener
class GroupTimelineAdapter(
private val postListener: GroupPostListener,
diff --git a/app/src/main/java/com/futo/circles/ui/groups/timeline/list/GroupTimelineViewHolder.kt b/app/src/main/java/com/futo/circles/feature/groups/timeline/list/GroupTimelineViewHolder.kt
similarity index 93%
rename from app/src/main/java/com/futo/circles/ui/groups/timeline/list/GroupTimelineViewHolder.kt
rename to app/src/main/java/com/futo/circles/feature/groups/timeline/list/GroupTimelineViewHolder.kt
index 36cf47c6c..521217943 100644
--- a/app/src/main/java/com/futo/circles/ui/groups/timeline/list/GroupTimelineViewHolder.kt
+++ b/app/src/main/java/com/futo/circles/feature/groups/timeline/list/GroupTimelineViewHolder.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.groups.timeline.list
+package com.futo.circles.feature.groups.timeline.list
import android.util.Size
import android.view.View
@@ -12,8 +12,8 @@ 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.ui.view.GroupPostListener
-import com.futo.circles.ui.view.PostLayout
+import com.futo.circles.feature.view.GroupPostListener
+import com.futo.circles.feature.view.PostLayout
sealed class GroupPostViewHolder(view: View) :
RecyclerView.ViewHolder(view) {
diff --git a/app/src/main/java/com/futo/circles/ui/home/HomeFragment.kt b/app/src/main/java/com/futo/circles/feature/home/HomeFragment.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/ui/home/HomeFragment.kt
rename to app/src/main/java/com/futo/circles/feature/home/HomeFragment.kt
index db01f7099..608fac850 100644
--- a/app/src/main/java/com/futo/circles/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/home/HomeFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.home
+package com.futo.circles.feature.home
import androidx.fragment.app.Fragment
import com.futo.circles.R
diff --git a/app/src/main/java/com/futo/circles/ui/log_in/LogInFragment.kt b/app/src/main/java/com/futo/circles/feature/log_in/LogInFragment.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/ui/log_in/LogInFragment.kt
rename to app/src/main/java/com/futo/circles/feature/log_in/LogInFragment.kt
index 691fc4321..40abd4034 100644
--- a/app/src/main/java/com/futo/circles/ui/log_in/LogInFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/log_in/LogInFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.log_in
+package com.futo.circles.feature.log_in
import android.os.Bundle
import android.view.View
diff --git a/app/src/main/java/com/futo/circles/ui/log_in/LogInViewModel.kt b/app/src/main/java/com/futo/circles/feature/log_in/LogInViewModel.kt
similarity index 85%
rename from app/src/main/java/com/futo/circles/ui/log_in/LogInViewModel.kt
rename to app/src/main/java/com/futo/circles/feature/log_in/LogInViewModel.kt
index 3e21b610a..fe58c1947 100644
--- a/app/src/main/java/com/futo/circles/ui/log_in/LogInViewModel.kt
+++ b/app/src/main/java/com/futo/circles/feature/log_in/LogInViewModel.kt
@@ -1,10 +1,10 @@
-package com.futo.circles.ui.log_in
+package com.futo.circles.feature.log_in
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import com.futo.circles.extensions.Response
import com.futo.circles.extensions.launchBg
-import com.futo.circles.ui.log_in.data_source.LoginDataSource
+import com.futo.circles.feature.log_in.data_source.LoginDataSource
import org.matrix.android.sdk.api.session.Session
class LogInViewModel(
diff --git a/app/src/main/java/com/futo/circles/ui/log_in/data_source/LoginDataSource.kt b/app/src/main/java/com/futo/circles/feature/log_in/data_source/LoginDataSource.kt
similarity index 95%
rename from app/src/main/java/com/futo/circles/ui/log_in/data_source/LoginDataSource.kt
rename to app/src/main/java/com/futo/circles/feature/log_in/data_source/LoginDataSource.kt
index 45bb6609b..86a0403d6 100644
--- a/app/src/main/java/com/futo/circles/ui/log_in/data_source/LoginDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/log_in/data_source/LoginDataSource.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.log_in.data_source
+package com.futo.circles.feature.log_in.data_source
import android.content.Context
import android.net.Uri
diff --git a/app/src/main/java/com/futo/circles/ui/people/PeopleFragment.kt b/app/src/main/java/com/futo/circles/feature/people/PeopleFragment.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/ui/people/PeopleFragment.kt
rename to app/src/main/java/com/futo/circles/feature/people/PeopleFragment.kt
index fd27cb846..fa5969c99 100644
--- a/app/src/main/java/com/futo/circles/ui/people/PeopleFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/people/PeopleFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.people
+package com.futo.circles.feature.people
import androidx.fragment.app.Fragment
import com.futo.circles.R
diff --git a/app/src/main/java/com/futo/circles/ui/photos/PhotosFragment.kt b/app/src/main/java/com/futo/circles/feature/photos/PhotosFragment.kt
similarity index 75%
rename from app/src/main/java/com/futo/circles/ui/photos/PhotosFragment.kt
rename to app/src/main/java/com/futo/circles/feature/photos/PhotosFragment.kt
index 7f1d4afda..60fd9e1e3 100644
--- a/app/src/main/java/com/futo/circles/ui/photos/PhotosFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/photos/PhotosFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.photos
+package com.futo.circles.feature.photos
import androidx.fragment.app.Fragment
import com.futo.circles.R
diff --git a/app/src/main/java/com/futo/circles/ui/sign_up/SignUpFragment.kt b/app/src/main/java/com/futo/circles/feature/sign_up/SignUpFragment.kt
similarity index 90%
rename from app/src/main/java/com/futo/circles/ui/sign_up/SignUpFragment.kt
rename to app/src/main/java/com/futo/circles/feature/sign_up/SignUpFragment.kt
index 5a060f2b0..1868e4912 100644
--- a/app/src/main/java/com/futo/circles/ui/sign_up/SignUpFragment.kt
+++ b/app/src/main/java/com/futo/circles/feature/sign_up/SignUpFragment.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.sign_up
+package com.futo.circles.feature.sign_up
import android.os.Bundle
import android.view.View
diff --git a/app/src/main/java/com/futo/circles/ui/view/AdvancedOptionsView.kt b/app/src/main/java/com/futo/circles/feature/view/AdvancedOptionsView.kt
similarity index 84%
rename from app/src/main/java/com/futo/circles/ui/view/AdvancedOptionsView.kt
rename to app/src/main/java/com/futo/circles/feature/view/AdvancedOptionsView.kt
index b4a5fa6f3..c47b3700e 100644
--- a/app/src/main/java/com/futo/circles/ui/view/AdvancedOptionsView.kt
+++ b/app/src/main/java/com/futo/circles/feature/view/AdvancedOptionsView.kt
@@ -1,15 +1,11 @@
-package com.futo.circles.ui.view
+package com.futo.circles.feature.view
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.view.isVisible
-import com.futo.circles.R
import com.futo.circles.databinding.AdvancedOptionsViewBinding
-import com.futo.circles.extensions.gone
import com.futo.circles.extensions.setVisibility
-import com.futo.circles.extensions.visible
class AdvancedOptionsView(
context: Context,
diff --git a/app/src/main/java/com/futo/circles/ui/view/CirclesLogoView.kt b/app/src/main/java/com/futo/circles/feature/view/CirclesLogoView.kt
similarity index 98%
rename from app/src/main/java/com/futo/circles/ui/view/CirclesLogoView.kt
rename to app/src/main/java/com/futo/circles/feature/view/CirclesLogoView.kt
index 75eecb2a5..240ce5400 100644
--- a/app/src/main/java/com/futo/circles/ui/view/CirclesLogoView.kt
+++ b/app/src/main/java/com/futo/circles/feature/view/CirclesLogoView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.view
+package com.futo.circles.feature.view
import android.content.Context
import android.graphics.*
diff --git a/app/src/main/java/com/futo/circles/ui/view/ExpandContentButton.kt b/app/src/main/java/com/futo/circles/feature/view/ExpandContentButton.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/ui/view/ExpandContentButton.kt
rename to app/src/main/java/com/futo/circles/feature/view/ExpandContentButton.kt
index 0e126b9e3..df4d97746 100644
--- a/app/src/main/java/com/futo/circles/ui/view/ExpandContentButton.kt
+++ b/app/src/main/java/com/futo/circles/feature/view/ExpandContentButton.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.view
+package com.futo.circles.feature.view
import android.content.Context
import android.graphics.drawable.Drawable
diff --git a/app/src/main/java/com/futo/circles/ui/view/GroupPostFooterView.kt b/app/src/main/java/com/futo/circles/feature/view/GroupPostFooterView.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/ui/view/GroupPostFooterView.kt
rename to app/src/main/java/com/futo/circles/feature/view/GroupPostFooterView.kt
index 71d4e9e39..618291185 100644
--- a/app/src/main/java/com/futo/circles/ui/view/GroupPostFooterView.kt
+++ b/app/src/main/java/com/futo/circles/feature/view/GroupPostFooterView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.view
+package com.futo.circles.feature.view
import android.content.Context
import android.util.AttributeSet
diff --git a/app/src/main/java/com/futo/circles/ui/view/GroupPostHeaderView.kt b/app/src/main/java/com/futo/circles/feature/view/GroupPostHeaderView.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/ui/view/GroupPostHeaderView.kt
rename to app/src/main/java/com/futo/circles/feature/view/GroupPostHeaderView.kt
index 99c87416b..15d8cd1db 100644
--- a/app/src/main/java/com/futo/circles/ui/view/GroupPostHeaderView.kt
+++ b/app/src/main/java/com/futo/circles/feature/view/GroupPostHeaderView.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.view
+package com.futo.circles.feature.view
import android.content.Context
import android.util.AttributeSet
diff --git a/app/src/main/java/com/futo/circles/ui/view/LoadingButton.kt b/app/src/main/java/com/futo/circles/feature/view/LoadingButton.kt
similarity index 97%
rename from app/src/main/java/com/futo/circles/ui/view/LoadingButton.kt
rename to app/src/main/java/com/futo/circles/feature/view/LoadingButton.kt
index 14bb59eb1..31e8f8bd5 100644
--- a/app/src/main/java/com/futo/circles/ui/view/LoadingButton.kt
+++ b/app/src/main/java/com/futo/circles/feature/view/LoadingButton.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.view
+package com.futo.circles.feature.view
import android.content.Context
import android.util.AttributeSet
diff --git a/app/src/main/java/com/futo/circles/ui/view/PostLayout.kt b/app/src/main/java/com/futo/circles/feature/view/PostLayout.kt
similarity index 96%
rename from app/src/main/java/com/futo/circles/ui/view/PostLayout.kt
rename to app/src/main/java/com/futo/circles/feature/view/PostLayout.kt
index 973e172eb..5a41293e5 100644
--- a/app/src/main/java/com/futo/circles/ui/view/PostLayout.kt
+++ b/app/src/main/java/com/futo/circles/feature/view/PostLayout.kt
@@ -1,4 +1,4 @@
-package com.futo.circles.ui.view
+package com.futo.circles.feature.view
import android.content.Context
import android.util.AttributeSet
@@ -15,7 +15,6 @@ import com.futo.circles.model.Post
import com.futo.circles.model.PostItemPayload
import com.futo.circles.model.ReplyPost
import com.futo.circles.model.RootPost
-import org.matrix.android.sdk.api.session.content.ContentUrlResolver
interface GroupPostListener {
diff --git a/app/src/main/res/layout/advanced_options_view.xml b/app/src/main/res/layout/advanced_options_view.xml
index f3870d329..3ecea53b4 100644
--- a/app/src/main/res/layout/advanced_options_view.xml
+++ b/app/src/main/res/layout/advanced_options_view.xml
@@ -6,7 +6,7 @@
android:layout_height="wrap_content"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
- <com.futo.circles.ui.view.ExpandContentButton
+ <com.futo.circles.feature.view.ExpandContentButton
android:id="@+id/btnAdvanced"
style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/circles_fragment.xml b/app/src/main/res/layout/circles_fragment.xml
index 12924d0b3..2ef611ae3 100644
--- a/app/src/main/res/layout/circles_fragment.xml
+++ b/app/src/main/res/layout/circles_fragment.xml
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".ui.circles.CirclesFragment">
+ tools:context=".feature.circles.CirclesFragment">
diff --git a/app/src/main/res/layout/image_post_view.xml b/app/src/main/res/layout/image_post_view.xml
index 460a022b5..23af4547e 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.ui.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.futo.circles.feature.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/lImagePost"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -9,4 +9,4 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
-</com.futo.circles.ui.view.PostLayout>
\ No newline at end of file
+</com.futo.circles.feature.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 726033e6d..a753615e5 100644
--- a/app/src/main/res/layout/invite_members_dialog_fragment.xml
+++ b/app/src/main/res/layout/invite_members_dialog_fragment.xml
@@ -24,17 +24,37 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar" />
-
- <TextView
- style="@style/title0"
- android:layout_width="wrap_content"
+ <com.google.android.material.textfield.TextInputLayout
+ android:id="@+id/tilSearch"
+ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:text="@string/invite_members"
- app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_margin="8dp"
+ android:hint="@string/search_by_name_or_id"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/toolbarDivider">
+
+ <com.google.android.material.textfield.TextInputEditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:imeOptions="actionDone"
+ android:inputType="text"
+ android:maxLines="1"
+ android:padding="12dp" />
+
+ </com.google.android.material.textfield.TextInputLayout>
- app:layout_constraintTop_toTopOf="parent" />
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rvUsers"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:layout_marginTop="8dp"
+ app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tilSearch" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/log_in_fragment.xml b/app/src/main/res/layout/log_in_fragment.xml
index 58059dd5c..dbe6798df 100644
--- a/app/src/main/res/layout/log_in_fragment.xml
+++ b/app/src/main/res/layout/log_in_fragment.xml
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:animateLayoutChanges="true"
android:layout_height="match_parent"
- tools:context=".ui.log_in.LogInFragment">
+ tools:context=".feature.log_in.LogInFragment">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guidelineStart"
@@ -42,7 +42,7 @@
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.3" />
- <com.futo.circles.ui.view.CirclesLogoView
+ <com.futo.circles.feature.view.CirclesLogoView
android:id="@+id/ivLogo"
android:layout_width="0dp"
android:layout_height="0dp"
@@ -120,7 +120,7 @@
</com.google.android.material.textfield.TextInputLayout>
- <com.futo.circles.ui.view.AdvancedOptionsView
+ <com.futo.circles.feature.view.AdvancedOptionsView
android:id="@+id/tvAdvancedOptions"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -130,7 +130,7 @@
app:layout_constraintStart_toStartOf="@id/guidelineStart"
app:layout_constraintTop_toBottomOf="@id/tilPassword" />
- <com.futo.circles.ui.view.LoadingButton
+ <com.futo.circles.feature.view.LoadingButton
android:id="@+id/btnLogin"
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 74f47e39c..0bceb6f15 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.ui.view.GroupPostHeaderView
+ <com.futo.circles.feature.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.ui.view.GroupPostFooterView
+ <com.futo.circles.feature.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.ui.view.ExpandContentButton
+ <com.futo.circles.feature.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/text_post_view.xml b/app/src/main/res/layout/text_post_view.xml
index c11aade96..48d973dca 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.ui.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.futo.circles.feature.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.ui.view.PostLayout>
\ No newline at end of file
+</com.futo.circles.feature.view.PostLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/groups_nav_graph.xml b/app/src/main/res/navigation/groups_nav_graph.xml
index 452706ed6..dc4064110 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.ui.groups.GroupsFragment"
+ android:name="com.futo.circles.feature.groups.GroupsFragment"
android:label="@string/my_groups"
tools:layout="@layout/groups_fragment">
<action
@@ -23,7 +23,7 @@
</fragment>
<fragment
android:id="@+id/groupTimelineFragment"
- android:name="com.futo.circles.ui.groups.timeline.GroupTimelineFragment"
+ android:name="com.futo.circles.feature.groups.timeline.GroupTimelineFragment"
tools:layout="@layout/group_timeline_fragment">
<argument
@@ -46,7 +46,7 @@
<dialog
android:id="@+id/inviteMembersDialogFragment"
- android:name="com.futo.circles.ui.groups.timeline.invite.InviteMembersDialogFragment"
+ android:name="com.futo.circles.feature.groups.timeline.invite.InviteMembersDialogFragment"
tools:layout="@layout/invite_members_dialog_fragment">
<argument
diff --git a/app/src/main/res/navigation/nav_graph_bottom_menu.xml b/app/src/main/res/navigation/nav_graph_bottom_menu.xml
index 5e7ce4402..351858050 100644
--- a/app/src/main/res/navigation/nav_graph_bottom_menu.xml
+++ b/app/src/main/res/navigation/nav_graph_bottom_menu.xml
@@ -7,12 +7,12 @@
<fragment
android:id="@+id/homeFragment"
- android:name="com.futo.circles.ui.home.HomeFragment"
+ android:name="com.futo.circles.feature.home.HomeFragment"
android:label="@string/welcome"
tools:layout="@layout/home_fragment" />
<fragment
android:id="@+id/circlesFragment"
- android:name="com.futo.circles.ui.circles.CirclesFragment"
+ android:name="com.futo.circles.feature.circles.CirclesFragment"
android:label="@string/my_circles"
tools:layout="@layout/circles_fragment" />
@@ -20,12 +20,12 @@
<fragment
android:id="@+id/peopleFragment"
- android:name="com.futo.circles.ui.people.PeopleFragment"
+ android:name="com.futo.circles.feature.people.PeopleFragment"
android:label="@string/my_people"
tools:layout="@layout/people_fragment" />
<fragment
android:id="@+id/photosFragment"
- android:name="com.futo.circles.ui.photos.PhotosFragment"
+ android:name="com.futo.circles.feature.photos.PhotosFragment"
android:label="@string/photo_galleries"
tools:layout="@layout/photos_fragment" />
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 308d495ab..2f58d0fae 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/logInFragment"
- android:name="com.futo.circles.ui.log_in.LogInFragment"
+ android:name="com.futo.circles.feature.log_in.LogInFragment"
android:label="Log In"
tools:layout="@layout/log_in_fragment">
<action
@@ -22,7 +22,7 @@
<fragment
android:id="@+id/signUpFragment"
- android:name="com.futo.circles.ui.sign_up.SignUpFragment"
+ android:name="com.futo.circles.feature.sign_up.SignUpFragment"
android:label="Log In"
tools:layout="@layout/sign_up_fragment">
<action
@@ -34,7 +34,7 @@
<fragment
android:id="@+id/bottomNavigationFragment"
- android:name="com.futo.circles.ui.bottom_navigation.BottomNavigationFragment"
+ android:name="com.futo.circles.feature.bottom_navigation.BottomNavigationFragment"
android:label="Bottom Navigation"
tools:layout="@layout/bottom_navigation_fragment" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d7fa7a453..15530f2eb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,9 +26,9 @@
<string name="reply">Reply</string>
<string name="share">Share</string>
<string name="hide_replies">Hide replies</string>
-
<string name="invite_members">Invite members</string>
<string name="invite_members_to_format">Invite members to %s</string>
+ <string name="search_by_name_or_id">Search by name or id</string>
<plurals name="member_plurals">
<item quantity="one">%d member</item>
--
GitLab