New res./layout codestyle

app/src/main/java/org/futo/circles/core/list/ChipItemViewHolder.kt

@@ -2,16 +2,16 @@ package org.futo.circles.core.list
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import org.futo.circles.databinding.ChipListItemBinding
+import org.futo.circles.databinding.ListItemChipBinding
 
 class ChipItemViewHolder(
     parent: ViewGroup,
     private val onItemDeselected: (Int) -> Unit
-) : RecyclerView.ViewHolder(inflate(parent, ChipListItemBinding::inflate)) {
+) : RecyclerView.ViewHolder(inflate(parent, ListItemChipBinding::inflate)) {
 
     private companion object : ViewBindingHolder
 
-    private val binding = baseBinding as ChipListItemBinding
+    private val binding = baseBinding as ListItemChipBinding
 
     init {
         binding.chipView.setOnCloseIconClickListener {

app/src/main/java/org/futo/circles/core/matrix/pass_phrase/LoadingDialog.kt

@@ -4,13 +4,13 @@ import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatDialog
-import org.futo.circles.databinding.LoadingDialogBinding
+import org.futo.circles.databinding.DialogLoadingBinding
 import org.futo.circles.model.LoadingData
 
 
 class LoadingDialog(context: Context) : AppCompatDialog(context) {
 
-    private val binding = LoadingDialogBinding.inflate(LayoutInflater.from(context))
+    private val binding = DialogLoadingBinding.inflate(LayoutInflater.from(context))
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()

app/src/main/java/org/futo/circles/core/picker/PickGalleryMediaDialogFragment.kt

@@ -9,7 +9,7 @@ import androidx.fragment.app.setFragmentResult
 import org.futo.circles.R
 import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
 import org.futo.circles.core.picker.MediaPickerHelper.Companion.IS_VIDEO_AVAILABLE
-import org.futo.circles.databinding.PickGalleryImageDialogFragmentBinding
+import org.futo.circles.databinding.DialogFragmentPickGalleryImageBinding
 import org.futo.circles.feature.photos.PhotosFragment
 import org.futo.circles.feature.photos.gallery.GalleryFragment
 
@@ -22,13 +22,13 @@ interface PickGalleryMediaListener {
 }
 
 class PickGalleryMediaDialogFragment :
-    BaseFullscreenDialogFragment(PickGalleryImageDialogFragmentBinding::inflate),
+    BaseFullscreenDialogFragment(DialogFragmentPickGalleryImageBinding::inflate),
     PickGalleryListener, PickGalleryMediaListener {
 
     private val photosRoomsFragment by lazy { PhotosFragment() }
 
     private val binding by lazy {
-        getBinding() as PickGalleryImageDialogFragmentBinding
+        getBinding() as DialogFragmentPickGalleryImageBinding
     }
 
     private val isVideoAvailable by lazy {

app/src/main/java/org/futo/circles/core/picker/PickMediaDialog.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatDialog
-import org.futo.circles.databinding.PickImageDialogBinding
+import org.futo.circles.databinding.DialogPickImageBinding
 import org.futo.circles.extensions.setIsVisible
 
 
@@ -21,7 +21,7 @@ class PickMediaDialog(
 ) :
     AppCompatDialog(context) {
 
-    private val binding = PickImageDialogBinding.inflate(LayoutInflater.from(context))
+    private val binding = DialogPickImageBinding.inflate(LayoutInflater.from(context))
 
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/org/futo/circles/core/picker/device/PickDeviceMediaDialogFragment.kt

@@ -10,17 +10,17 @@ import org.futo.circles.core.picker.MediaPickerHelper
 import org.futo.circles.core.picker.MediaPickerHelper.Companion.IS_VIDEO_AVAILABLE
 import org.futo.circles.core.picker.device.list.DeviceMediaViewHolder
 import org.futo.circles.core.picker.device.list.DeviceMedialListAdapter
-import org.futo.circles.databinding.PickDeviceMediaDialogFragmentBinding
+import org.futo.circles.databinding.DialogFragmentPickDeviceMediaBinding
 import org.futo.circles.extensions.observeData
 import org.futo.circles.model.DeviceMediaListItem
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
 class PickDeviceMediaDialogFragment :
-    BaseFullscreenDialogFragment(PickDeviceMediaDialogFragmentBinding::inflate) {
+    BaseFullscreenDialogFragment(DialogFragmentPickDeviceMediaBinding::inflate) {
 
     private val binding by lazy {
-        getBinding() as PickDeviceMediaDialogFragmentBinding
+        getBinding() as DialogFragmentPickDeviceMediaBinding
     }
 
     private val viewModel by viewModel<PickDeviceMediaViewModel> {

app/src/main/java/org/futo/circles/core/picker/device/list/DeviceMediaViewHolder.kt

@@ -7,8 +7,8 @@ import com.bumptech.glide.Glide
 import org.futo.circles.core.list.ViewBindingHolder
 import org.futo.circles.core.list.context
 import org.futo.circles.core.picker.device.PickDeviceMediaDataSource
-import org.futo.circles.databinding.GalleryImageListItemBinding
-import org.futo.circles.databinding.GalleryVideoListItemBinding
+import org.futo.circles.databinding.ListItemGalleryImageBinding
+import org.futo.circles.databinding.ListItemGalleryVideoBinding
 import org.futo.circles.extensions.onClick
 import org.futo.circles.model.DeviceImageListItem
 import org.futo.circles.model.DeviceMediaListItem
@@ -21,11 +21,11 @@ abstract class DeviceMediaViewHolder(view: View) : RecyclerView.ViewHolder(view)
 class DeviceImageViewHolder(
     parent: ViewGroup,
     onMediaClicked: (Int) -> Unit
-) : DeviceMediaViewHolder(inflate(parent, GalleryImageListItemBinding::inflate)) {
+) : DeviceMediaViewHolder(inflate(parent, ListItemGalleryImageBinding::inflate)) {
 
     private companion object : ViewBindingHolder
 
-    private val binding = baseBinding as GalleryImageListItemBinding
+    private val binding = baseBinding as ListItemGalleryImageBinding
 
     init {
         onClick(binding.ivGalleryImage) { position -> onMediaClicked(position) }
@@ -46,11 +46,11 @@ class DeviceImageViewHolder(
 class DeviceVideoViewHolder(
     parent: ViewGroup,
     onMediaClicked: (Int) -> Unit
-) : DeviceMediaViewHolder(inflate(parent, GalleryVideoListItemBinding::inflate)) {
+) : DeviceMediaViewHolder(inflate(parent, ListItemGalleryVideoBinding::inflate)) {
 
     private companion object : ViewBindingHolder
 
-    private val binding = baseBinding as GalleryVideoListItemBinding
+    private val binding = baseBinding as ListItemGalleryVideoBinding
 
     init {
         onClick(itemView) { position -> onMediaClicked(position) }

app/src/main/java/org/futo/circles/core/rooms/RoomsFragment.kt

@@ -3,15 +3,12 @@ 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 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.databinding.FragmentRoomsBinding
 import org.futo.circles.extensions.bindToFab
 import org.futo.circles.extensions.observeData
 import org.futo.circles.extensions.observeResponse
@@ -21,10 +18,10 @@ interface HasInvites {
     fun onAcceptInviteClicked(room: RoomListItem)
 }
 
-abstract class RoomsFragment : Fragment(R.layout.rooms_fragment) {
+abstract class RoomsFragment : Fragment(R.layout.fragment_rooms) {
 
     abstract val viewModel: RoomsViewModel
-    protected val binding by viewBinding(RoomsFragmentBinding::bind)
+    protected val binding by viewBinding(FragmentRoomsBinding::bind)
     private val listAdapter by lazy {
         RoomsListAdapter(
             onRoomClicked = { roomListItem -> onRoomListItemClicked(roomListItem) },

app/src/main/java/org/futo/circles/core/rooms/list/RoomViewHolder.kt

@@ -34,11 +34,11 @@ abstract class RoomViewHolder(view: View) : RecyclerView.ViewHolder(view) {
 class JoinedGroupViewHolder(
     parent: ViewGroup,
     onGroupClicked: (Int) -> Unit
-) : RoomViewHolder(inflate(parent, JoinedGroupListItemBinding::inflate)) {
+) : RoomViewHolder(inflate(parent, ListItemJoinedGroupBinding::inflate)) {
 
     private companion object : ViewBindingHolder
 
-    private val binding = baseBinding as JoinedGroupListItemBinding
+    private val binding = baseBinding as ListItemJoinedGroupBinding
 
     init {
         onClick(itemView) { position -> onGroupClicked(position) }
@@ -88,11 +88,11 @@ class JoinedGroupViewHolder(
 class InvitedGroupViewHolder(
     parent: ViewGroup,
     onInviteClicked: (Int, Boolean) -> Unit
-) : RoomViewHolder(inflate(parent, InvitedGroupListItemBinding::inflate)) {
+) : RoomViewHolder(inflate(parent, ListItemInvitedGroupBinding::inflate)) {
 
     private companion object : ViewBindingHolder
 
-    private val binding = baseBinding as InvitedGroupListItemBinding
+    private val binding = baseBinding as ListItemInvitedGroupBinding
 
     init {
         onClick(binding.btnAccept) { position -> onInviteClicked(position, true) }
@@ -113,11 +113,11 @@ class InvitedGroupViewHolder(
 class JoinedCircleViewHolder(
     parent: ViewGroup,
     onCircleClicked: (Int) -> Unit
-) : RoomViewHolder(inflate(parent, JoinedCircleListItemBinding::inflate)) {
+) : RoomViewHolder(inflate(parent, ListItemJoinedCircleBinding::inflate)) {
 
     private companion object : ViewBindingHolder
 
-    private val binding = baseBinding as JoinedCircleListItemBinding
+    private val binding = baseBinding as ListItemJoinedCircleBinding
 
     init {
         onClick(itemView) { position -> onCircleClicked(position) }
@@ -151,11 +151,11 @@ class JoinedCircleViewHolder(
 class InvitedCircleViewHolder(
     parent: ViewGroup,
     onInviteClicked: (Int, Boolean) -> Unit
-) : RoomViewHolder(inflate(parent, InvitedCircleListItemBinding::inflate)) {
+) : RoomViewHolder(inflate(parent, ListItemInvitedCircleBinding::inflate)) {
 
     private companion object : ViewBindingHolder
 
-    private val binding = baseBinding as InvitedCircleListItemBinding
+    private val binding = baseBinding as ListItemInvitedCircleBinding
 
     init {
         onClick(binding.btnAccept) { position -> onInviteClicked(position, true) }
@@ -177,11 +177,11 @@ class InvitedCircleViewHolder(
 class GalleryViewHolder(
     parent: ViewGroup,
     onGalleryClicked: (Int) -> Unit
-) : RoomViewHolder(inflate(parent, GalleryListItemBinding::inflate)) {
+) : RoomViewHolder(inflate(parent, ListItemGalleryBinding::inflate)) {
 
     private companion object : ViewBindingHolder
 
-    private val binding = baseBinding as GalleryListItemBinding
+    private val binding = baseBinding as ListItemGalleryBinding
 
     init {
         onClick(itemView) { position -> onGalleryClicked(position) }

app/src/main/java/org/futo/circles/extensions/FragmentExtensions.kt

@@ -31,7 +31,7 @@ private fun Fragment.showBar(message: String, isError: Boolean, showOnActivity:
     snackLayout.setPadding(0, 0, 0, 0)
 
     val customSnackView = layoutInflater.inflate(
-        if (isError) R.layout.error_snack_bar_view else R.layout.success_snack_bar_view,
+        if (isError) R.layout.view_error_snack_bar else R.layout.view_success_snack_bar,
         null
     ).apply {
         findViewById<TextView>(R.id.tvMessage)?.text = message

app/src/main/java/org/futo/circles/feature/bottom_navigation/BottomNavigationFragment.kt

@@ -9,14 +9,14 @@ import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
 import by.kirich1409.viewbindingdelegate.viewBinding
 import org.futo.circles.R
-import org.futo.circles.databinding.BottomNavigationFragmentBinding
+import org.futo.circles.databinding.FragmentBottomNavigationBinding
 import org.futo.circles.extensions.observeData
 import org.futo.circles.extensions.setSupportActionBar
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
-class BottomNavigationFragment : Fragment(R.layout.bottom_navigation_fragment) {
+class BottomNavigationFragment : Fragment(R.layout.fragment_bottom_navigation) {
 
-    private val binding by viewBinding(BottomNavigationFragmentBinding::bind)
+    private val binding by viewBinding(FragmentBottomNavigationBinding::bind)
     private val systemNoticesCountViewModel by sharedViewModel<SystemNoticesCountSharedViewModel>()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

app/src/main/java/org/futo/circles/feature/circles/accept_invite/AcceptCircleInviteDialogFragment.kt

@@ -7,7 +7,7 @@ import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.DividerItemDecoration
 import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
 import org.futo.circles.core.fragment.HasLoadingState
-import org.futo.circles.databinding.AcceptCircleInviteDialogFragmentBinding
+import org.futo.circles.databinding.DialogFragmentAcceptCircleInviteBinding
 import org.futo.circles.extensions.observeData
 import org.futo.circles.extensions.observeResponse
 import org.futo.circles.extensions.setIsVisible
@@ -17,7 +17,7 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
 class AcceptCircleInviteDialogFragment :
-    BaseFullscreenDialogFragment(AcceptCircleInviteDialogFragmentBinding::inflate),
+    BaseFullscreenDialogFragment(DialogFragmentAcceptCircleInviteBinding::inflate),
     HasLoadingState {
 
     override val fragment: Fragment = this
@@ -26,7 +26,7 @@ class AcceptCircleInviteDialogFragment :
         parametersOf(args.roomId)
     }
     private val binding by lazy {
-        getBinding() as AcceptCircleInviteDialogFragmentBinding
+        getBinding() as DialogFragmentAcceptCircleInviteBinding
     }
     private val circlesInviteAdapter by lazy { CirclesInviteAdapter(viewModel::onCircleSelected) }
     private val selectedCircleAdapter by lazy { SelectedCirclesAdapter(viewModel::onCircleSelected) }

app/src/main/java/org/futo/circles/feature/circles/accept_invite/list/CirclesInviteViewHolder.kt

@@ -5,7 +5,7 @@ import androidx.recyclerview.widget.RecyclerView
 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.databinding.ListItemAcceptCircleInviteBinding
 import org.futo.circles.extensions.loadProfileIcon
 import org.futo.circles.extensions.onClick
 import org.futo.circles.extensions.setSelectableItemBackground
@@ -14,11 +14,11 @@ import org.futo.circles.model.SelectableRoomListItem
 class CirclesInviteViewHolder(
     parent: ViewGroup,
     private val onCircleClicked: (Int) -> Unit
-) : RecyclerView.ViewHolder(inflate(parent, AcceptCircleInviteListItemBinding::inflate)) {
+) : RecyclerView.ViewHolder(inflate(parent, ListItemAcceptCircleInviteBinding::inflate)) {
 
     private companion object : ViewBindingHolder
 
-    private val binding = baseBinding as AcceptCircleInviteListItemBinding
+    private val binding = baseBinding as ListItemAcceptCircleInviteBinding
 
     init {
         onClick(itemView) { position -> onCircleClicked(position) }

app/src/main/java/org/futo/circles/feature/circles/following/FollowingDialogFragment.kt

@@ -5,7 +5,7 @@ import android.view.View
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.DividerItemDecoration
 import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import org.futo.circles.databinding.FollowingDialogFragmentBinding
+import org.futo.circles.databinding.DialogFragmentFollowingBinding
 import org.futo.circles.extensions.observeData
 import org.futo.circles.extensions.observeResponse
 import org.futo.circles.feature.circles.following.list.FollowingAdapter
@@ -14,14 +14,14 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
 class FollowingDialogFragment :
-    BaseFullscreenDialogFragment(FollowingDialogFragmentBinding::inflate) {
+    BaseFullscreenDialogFragment(DialogFragmentFollowingBinding::inflate) {
 
     private val args: FollowingDialogFragmentArgs by navArgs()
     private val viewModel by viewModel<FollowingViewModel> {
         parametersOf(args.roomId)
     }
     private val binding by lazy {
-        getBinding() as FollowingDialogFragmentBinding
+        getBinding() as DialogFragmentFollowingBinding
     }
     private val listAdapter by lazy {
         FollowingAdapter(onRemoveClicked = { showRemoveOptionsDialog(it) })

app/src/main/java/org/futo/circles/feature/circles/following/RemoveFollowingDialog.kt

@@ -5,7 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatDialog
 import org.futo.circles.R
-import org.futo.circles.databinding.RemoveFollowingDialogBinding
+import org.futo.circles.databinding.DialogRemoveFollowingBinding
 import org.futo.circles.extensions.setIsVisible
 
 interface RemoveFollowingListener {
@@ -21,7 +21,7 @@ class RemoveFollowingDialog(
     private val listener: RemoveFollowingListener
 ) : AppCompatDialog(context) {
 
-    private val binding = RemoveFollowingDialogBinding.inflate(LayoutInflater.from(context))
+    private val binding = DialogRemoveFollowingBinding.inflate(LayoutInflater.from(context))
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/org/futo/circles/feature/circles/following/list/FollowingViewHolder.kt

@@ -6,7 +6,7 @@ import androidx.recyclerview.widget.RecyclerView
 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.databinding.ListItemFollowingBinding
 import org.futo.circles.extensions.loadProfileIcon
 import org.futo.circles.extensions.onClick
 import org.futo.circles.extensions.setIsVisible
@@ -15,11 +15,11 @@ import org.futo.circles.model.FollowingListItem
 class FollowingViewHolder(
     parent: ViewGroup,
     onRemoveClicked: (Int) -> Unit
-) : RecyclerView.ViewHolder(inflate(parent, FollowingListItemBinding::inflate)) {
+) : RecyclerView.ViewHolder(inflate(parent, ListItemFollowingBinding::inflate)) {
 
     private companion object : ViewBindingHolder
 
-    private val binding = baseBinding as FollowingListItemBinding
+    private val binding = baseBinding as ListItemFollowingBinding
 
     init {
         onClick(binding.ivRemove) { position -> onRemoveClicked(position) }

app/src/main/java/org/futo/circles/feature/log_in/EnterPassPhraseDialog.kt

@@ -5,7 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatDialog
 import androidx.core.widget.doAfterTextChanged
-import org.futo.circles.databinding.EnterPassphraseDialogBinding
+import org.futo.circles.databinding.DialogEnterPassphraseBinding
 import org.futo.circles.extensions.getText
 
 interface EnterPassPhraseDialogListener {
@@ -16,7 +16,7 @@ interface EnterPassPhraseDialogListener {
 class EnterPassPhraseDialog(context: Context, private val listener: EnterPassPhraseDialogListener) :
     AppCompatDialog(context) {
 
-    private val binding = EnterPassphraseDialogBinding.inflate(LayoutInflater.from(context))
+    private val binding = DialogEnterPassphraseBinding.inflate(LayoutInflater.from(context))
 
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/org/futo/circles/feature/log_in/LogInFragment.kt

@@ -8,7 +8,7 @@ import by.kirich1409.viewbindingdelegate.viewBinding
 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.databinding.FragmentLogInBinding
 import org.futo.circles.extensions.getText
 import org.futo.circles.extensions.observeData
 import org.futo.circles.extensions.observeResponse
@@ -16,11 +16,11 @@ import org.futo.circles.extensions.showError
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 
-class LogInFragment : Fragment(R.layout.log_in_fragment), HasLoadingState {
+class LogInFragment : Fragment(R.layout.fragment_log_in), HasLoadingState {
 
     override val fragment: Fragment = this
     private val viewModel by viewModel<LogInViewModel>()
-    private val binding by viewBinding(LogInFragmentBinding::bind)
+    private val binding by viewBinding(FragmentLogInBinding::bind)
     private val restorePassPhraseLoadingDialog by lazy { LoadingDialog(requireContext()) }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

app/src/main/java/org/futo/circles/feature/notices/SystemNoticesDialogFragment.kt

@@ -4,14 +4,14 @@ import android.os.Bundle
 import android.view.View
 import androidx.navigation.fragment.navArgs
 import org.futo.circles.core.fragment.BaseFullscreenDialogFragment
-import org.futo.circles.databinding.SystemNoticesDialogFragmentBinding
+import org.futo.circles.databinding.DialogFragmentSystemNoticesBinding
 import org.futo.circles.extensions.observeData
 import org.futo.circles.feature.notices.list.SystemNoticesTimelineAdapter
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
 class SystemNoticesDialogFragment :
-    BaseFullscreenDialogFragment(SystemNoticesDialogFragmentBinding::inflate) {
+    BaseFullscreenDialogFragment(DialogFragmentSystemNoticesBinding::inflate) {
 
     private val args: SystemNoticesDialogFragmentArgs by navArgs()
     private val viewModel by viewModel<SystemNoticesTimelineViewModel> {
@@ -19,7 +19,7 @@ class SystemNoticesDialogFragment :
     }
 
     private val binding by lazy {
-        getBinding() as SystemNoticesDialogFragmentBinding
+        getBinding() as DialogFragmentSystemNoticesBinding
     }
 
     private val listAdapter by lazy {

app/src/main/java/org/futo/circles/feature/notices/list/SystemNoticesViewHolder.kt

@@ -3,18 +3,18 @@ package org.futo.circles.feature.notices.list
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import org.futo.circles.core.list.ViewBindingHolder
-import org.futo.circles.databinding.SystemNoticesListItemBinding
+import org.futo.circles.databinding.ListItemSystemNoticesBinding
 import org.futo.circles.model.SystemNoticeListItem
 import java.text.DateFormat
 import java.util.*
 
 class SystemNoticesViewHolder(
     parent: ViewGroup
-) : RecyclerView.ViewHolder(inflate(parent, SystemNoticesListItemBinding::inflate)) {
+) : RecyclerView.ViewHolder(inflate(parent, ListItemSystemNoticesBinding::inflate)) {
 
     private companion object : ViewBindingHolder
 
-    private val binding = baseBinding as SystemNoticesListItemBinding
+    private val binding = baseBinding as ListItemSystemNoticesBinding
 
     fun bind(data: SystemNoticeListItem) {
         with(binding) {

app/src/main/java/org/futo/circles/feature/people/PeopleFragment.kt

@@ -7,7 +7,7 @@ import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.DividerItemDecoration
 import by.kirich1409.viewbindingdelegate.viewBinding
 import org.futo.circles.R
-import org.futo.circles.databinding.PeopleFragmentBinding
+import org.futo.circles.databinding.FragmentPeopleBinding
 import org.futo.circles.extensions.observeData
 import org.futo.circles.extensions.observeResponse
 import org.futo.circles.extensions.showDialog
@@ -15,10 +15,10 @@ 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) {
+class PeopleFragment : Fragment(R.layout.fragment_people) {
 
     private val viewModel by viewModel<PeopleViewModel>()
-    private val binding by viewBinding(PeopleFragmentBinding::bind)
+    private val binding by viewBinding(FragmentPeopleBinding::bind)
 
     private val peopleAdapter by lazy {
         PeopleAdapter(