Browse Source

rename layouts for banning

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
Marcel Hibbe 8 months ago
parent
commit
94fbdb25ac

+ 4 - 4
app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt

@@ -48,7 +48,7 @@ import com.nextcloud.talk.conversationinfo.viewmodel.ConversationInfoViewModel
 import com.nextcloud.talk.conversationinfoedit.ConversationInfoEditActivity
 import com.nextcloud.talk.conversationinfoedit.ConversationInfoEditActivity
 import com.nextcloud.talk.data.user.model.User
 import com.nextcloud.talk.data.user.model.User
 import com.nextcloud.talk.databinding.ActivityConversationInfoBinding
 import com.nextcloud.talk.databinding.ActivityConversationInfoBinding
-import com.nextcloud.talk.databinding.DialogBanActorBinding
+import com.nextcloud.talk.databinding.DialogBanParticipantBinding
 import com.nextcloud.talk.events.EventStatus
 import com.nextcloud.talk.events.EventStatus
 import com.nextcloud.talk.extensions.loadConversationAvatar
 import com.nextcloud.talk.extensions.loadConversationAvatar
 import com.nextcloud.talk.extensions.loadNoteToSelfAvatar
 import com.nextcloud.talk.extensions.loadNoteToSelfAvatar
@@ -1375,7 +1375,7 @@ class ConversationInfoActivity :
 
 
     private fun MaterialDialog.handleBan(participant: Participant) {
     private fun MaterialDialog.handleBan(participant: Participant) {
         val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(ApiUtils.API_V4, 1))
         val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(ApiUtils.API_V4, 1))
-        val binding = DialogBanActorBinding.inflate(layoutInflater)
+        val binding = DialogBanParticipantBinding.inflate(layoutInflater)
         val actorTypeConverter = EnumActorTypeConverter()
         val actorTypeConverter = EnumActorTypeConverter()
         val dialog = MaterialAlertDialogBuilder(context)
         val dialog = MaterialAlertDialogBuilder(context)
             .setView(binding.root)
             .setView(binding.root)
@@ -1391,13 +1391,13 @@ class ConversationInfoActivity :
             banActor(
             banActor(
                 actorTypeConverter.convertToString(participant.actorType!!),
                 actorTypeConverter.convertToString(participant.actorType!!),
                 participant.actorId!!,
                 participant.actorId!!,
-                binding.banActorEdit.text.toString()
+                binding.banParticipantEdit.text.toString()
             )
             )
             removeAttendeeFromConversation(apiVersion, participant)
             removeAttendeeFromConversation(apiVersion, participant)
             dialog.dismiss()
             dialog.dismiss()
         }
         }
         binding.buttonClose.setOnClickListener { dialog.dismiss() }
         binding.buttonClose.setOnClickListener { dialog.dismiss() }
-        viewThemeUtils.material.colorTextInputLayout(binding.banActorEditLayout)
+        viewThemeUtils.material.colorTextInputLayout(binding.banParticipantEditLayout)
         viewThemeUtils.material.colorMaterialButtonPrimaryFilled(binding.buttonBan)
         viewThemeUtils.material.colorMaterialButtonPrimaryFilled(binding.buttonBan)
         viewThemeUtils.material.colorMaterialButtonText(binding.buttonClose)
         viewThemeUtils.material.colorMaterialButtonText(binding.buttonClose)
         dialog.show()
         dialog.show()

+ 3 - 3
app/src/main/res/layout/dialog_ban_actor.xml → app/src/main/res/layout/dialog_ban_participant.xml

@@ -24,7 +24,7 @@
         android:layout_height="wrap_content" />
         android:layout_height="wrap_content" />
 
 
     <RelativeLayout
     <RelativeLayout
-        android:id="@+id/ban_actor_profile"
+        android:id="@+id/ban_participant_profile"
         android:layout_width="match_parent"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/standard_margin"
         android:layout_marginStart="@dimen/standard_margin"
@@ -55,7 +55,7 @@
     </RelativeLayout>
     </RelativeLayout>
 
 
     <com.google.android.material.textfield.TextInputLayout
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/ban_actor_edit_layout"
+        android:id="@+id/ban_participant_edit_layout"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
         android:layout_width="match_parent"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
@@ -63,7 +63,7 @@
         android:hint="@string/internal_note">
         android:hint="@string/internal_note">
 
 
         <com.google.android.material.textfield.MaterialAutoCompleteTextView
         <com.google.android.material.textfield.MaterialAutoCompleteTextView
-            android:id="@+id/ban_actor_edit"
+            android:id="@+id/ban_participant_edit"
             android:layout_width="match_parent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
             android:inputType="textShortMessage"
             android:inputType="textShortMessage"