From 5f0563aae35193646dd19aee8e126ba930d0f4b2 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Fri, 9 Aug 2024 12:38:19 +0200
Subject: [PATCH 1/2] fix strings for banning (use 'participant' instead
 'actor')

replace key ban_actor with ban_participant

fix upper/lower case

fix to use translation in ConversationInfoActivity instead hardcoded string

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/conversationinfo/ConversationInfoActivity.kt  |  2 +-
 app/src/main/res/layout/dialog_ban_actor.xml           |  2 +-
 app/src/main/res/values/strings.xml                    | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
index dad95186b0..e2ec5ef8fb 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
@@ -1311,7 +1311,7 @@ class ConversationInfoActivity :
             items.add(
                 BasicListItemWithImage(
                     R.drawable.baseline_block_24,
-                    "Ban Participant"
+                    context.getString(R.string.ban_participant)
                 )
             )
         }
diff --git a/app/src/main/res/layout/dialog_ban_actor.xml b/app/src/main/res/layout/dialog_ban_actor.xml
index 0bcf22574a..6bb6099257 100644
--- a/app/src/main/res/layout/dialog_ban_actor.xml
+++ b/app/src/main/res/layout/dialog_ban_actor.xml
@@ -16,7 +16,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/standard_margin"
-        android:text="@string/ban_actor"
+        android:text="@string/ban_participant"
         android:textSize="@dimen/md_title_textsize" />
 
     <com.google.android.material.divider.MaterialDivider
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a89e0dd50a..f7de089f53 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -792,12 +792,12 @@ How to translate with transifex:
     <string name="message_last_edited_by">Edited by %1$s</string>
     <string name="share_link_to_conversation">Join conversation %1$s at %2$s</string>
     <string name="nc_conversation_settings">Conversation settings</string>
-    <string name="show_banned_participants">Show Banned Participants</string>
-    <string name="bans_list">Bans List</string>
+    <string name="ban_participant">Ban participant</string>
+    <string name="show_banned_participants">Show banned participants</string>
+    <string name="bans_list">Bans list</string>
     <string name="unban">Unban</string>
-    <string name="internal_note">Internal Note</string>
-    <string name="ban_actor">Ban Actor</string>
+    <string name="internal_note">Internal note</string>
     <string name="ban">Ban</string>
     <string name="show_ban_reason">Show ban reason</string>
-    <string name="error_unbanning">Error occured when unbanning actor</string>
+    <string name="error_unbanning">Error occurred when unbanning participant</string>
 </resources>

From 94fbdb25acfab4c75daa213e22acc406847fb811 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Fri, 9 Aug 2024 12:58:53 +0200
Subject: [PATCH 2/2] rename layouts for banning

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/conversationinfo/ConversationInfoActivity.kt     | 8 ++++----
 .../{dialog_ban_actor.xml => dialog_ban_participant.xml}  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename app/src/main/res/layout/{dialog_ban_actor.xml => dialog_ban_participant.xml} (96%)

diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
index e2ec5ef8fb..b4ee2aeb0f 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
+++ b/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.data.user.model.User
 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.extensions.loadConversationAvatar
 import com.nextcloud.talk.extensions.loadNoteToSelfAvatar
@@ -1375,7 +1375,7 @@ class ConversationInfoActivity :
 
     private fun MaterialDialog.handleBan(participant: Participant) {
         val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(ApiUtils.API_V4, 1))
-        val binding = DialogBanActorBinding.inflate(layoutInflater)
+        val binding = DialogBanParticipantBinding.inflate(layoutInflater)
         val actorTypeConverter = EnumActorTypeConverter()
         val dialog = MaterialAlertDialogBuilder(context)
             .setView(binding.root)
@@ -1391,13 +1391,13 @@ class ConversationInfoActivity :
             banActor(
                 actorTypeConverter.convertToString(participant.actorType!!),
                 participant.actorId!!,
-                binding.banActorEdit.text.toString()
+                binding.banParticipantEdit.text.toString()
             )
             removeAttendeeFromConversation(apiVersion, participant)
             dialog.dismiss()
         }
         binding.buttonClose.setOnClickListener { dialog.dismiss() }
-        viewThemeUtils.material.colorTextInputLayout(binding.banActorEditLayout)
+        viewThemeUtils.material.colorTextInputLayout(binding.banParticipantEditLayout)
         viewThemeUtils.material.colorMaterialButtonPrimaryFilled(binding.buttonBan)
         viewThemeUtils.material.colorMaterialButtonText(binding.buttonClose)
         dialog.show()
diff --git a/app/src/main/res/layout/dialog_ban_actor.xml b/app/src/main/res/layout/dialog_ban_participant.xml
similarity index 96%
rename from app/src/main/res/layout/dialog_ban_actor.xml
rename to app/src/main/res/layout/dialog_ban_participant.xml
index 6bb6099257..0e70695aef 100644
--- a/app/src/main/res/layout/dialog_ban_actor.xml
+++ b/app/src/main/res/layout/dialog_ban_participant.xml
@@ -24,7 +24,7 @@
         android:layout_height="wrap_content" />
 
     <RelativeLayout
-        android:id="@+id/ban_actor_profile"
+        android:id="@+id/ban_participant_profile"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/standard_margin"
@@ -55,7 +55,7 @@
     </RelativeLayout>
 
     <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"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -63,7 +63,7 @@
         android:hint="@string/internal_note">
 
         <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_height="wrap_content"
             android:inputType="textShortMessage"