From 4097ea377d3df63e0f5eb900bb5885055565c246 Mon Sep 17 00:00:00 2001
From: Jatin Nagar <jatin.nagar@100ms.live>
Date: Wed, 15 May 2024 15:01:06 +0530
Subject: [PATCH 1/2] refactor: removed "not required to answer" switch

from poll question creator ui for platform parity
---
 .../ui/polls/PollQuestionViewHolder.kt        |  7 +++---
 .../live/hms/roomkit/ui/theme/ThemeExt.kt     |  3 ++-
 .../layout_poll_question_creation_item.xml    | 25 ++++++++++---------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/room-kit/src/main/java/live/hms/roomkit/ui/polls/PollQuestionViewHolder.kt b/room-kit/src/main/java/live/hms/roomkit/ui/polls/PollQuestionViewHolder.kt
index f5af7ad67..1a3afab3c 100644
--- a/room-kit/src/main/java/live/hms/roomkit/ui/polls/PollQuestionViewHolder.kt
+++ b/room-kit/src/main/java/live/hms/roomkit/ui/polls/PollQuestionViewHolder.kt
@@ -101,9 +101,10 @@ class PollQuestionViewHolder<T : ViewBinding>(
     private fun bind(questionUi: QuestionUi.QuestionCreator) {
         with(binding as LayoutPollQuestionCreationItemBinding) {
             binding.applyTheme()
-            notRequiredToAnswer.setOnCheckedChangeListener { _, b ->
-                getItem(bindingAdapterPosition).currentQuestion.requiredToAnswer = b
-            }
+//            <-- Removed `notRequiredToAnswer` switch for platform parity -->
+//            notRequiredToAnswer.setOnCheckedChangeListener { _, b ->
+//                getItem(bindingAdapterPosition).currentQuestion.requiredToAnswer = b
+//            }
             binding.askAQuestionEditText.setText(questionUi.currentQuestion.withTitle)
             binding.askAQuestionEditText.addTextChangedListener(object : TextWatcher {
                 override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
diff --git a/room-kit/src/main/java/live/hms/roomkit/ui/theme/ThemeExt.kt b/room-kit/src/main/java/live/hms/roomkit/ui/theme/ThemeExt.kt
index 22874242c..c058bf2cd 100644
--- a/room-kit/src/main/java/live/hms/roomkit/ui/theme/ThemeExt.kt
+++ b/room-kit/src/main/java/live/hms/roomkit/ui/theme/ThemeExt.kt
@@ -2528,7 +2528,8 @@ fun LayoutPollQuestionCreationItemBinding.applyTheme() {
     )
     )
 
-    setSwitchThemes(notRequiredToAnswer)
+//    <-- Removed "Not Required To Answer" switch for platform parity -->
+//    setSwitchThemes(notRequiredToAnswer)
 
     saveButton.saveButtonEnabled()
 
diff --git a/room-kit/src/main/res/layout/layout_poll_question_creation_item.xml b/room-kit/src/main/res/layout/layout_poll_question_creation_item.xml
index b2987ac66..0c28948dd 100644
--- a/room-kit/src/main/res/layout/layout_poll_question_creation_item.xml
+++ b/room-kit/src/main/res/layout/layout_poll_question_creation_item.xml
@@ -124,28 +124,29 @@
             android:textSize="14sp"
             android:fontFamily="@font/inter_regular"
             android:lineHeight="20sp"
-            app:layout_constraintBottom_toTopOf="@id/notRequiredToAnswer"
+            app:layout_constraintBottom_toTopOf="@id/border"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/optionsListRadioGroupVG" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/notRequiredToAnswer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Not required to answer"
-            app:layout_constraintBottom_toTopOf="@+id/border"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/addAnOptionTextView"
-            tools:visibility="visible" />
+<!--        Removed `notRequiredToAnswer` switch for platform parity -->
+<!--        <com.google.android.material.switchmaterial.SwitchMaterial-->
+<!--            android:id="@+id/notRequiredToAnswer"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:text="Not required to answer"-->
+<!--            app:layout_constraintBottom_toTopOf="@+id/border"-->
+<!--            app:layout_constraintEnd_toEndOf="parent"-->
+<!--            app:layout_constraintStart_toStartOf="parent"-->
+<!--            app:layout_constraintTop_toBottomOf="@+id/addAnOptionTextView"-->
+<!--            tools:visibility="visible" />-->
 
         <View
             android:id="@+id/border"
             android:layout_width="match_parent"
             android:layout_height="0.5px"
             app:layout_constraintBottom_toTopOf="@id/saveButton"
-            app:layout_constraintTop_toBottomOf="@id/notRequiredToAnswer"
+            app:layout_constraintTop_toBottomOf="@id/addAnOptionTextView"
             android:layout_marginVertical="@dimen/spacing_d1"
             android:background="@drawable/gray_line_vertical_divider" />
 

From b74745a84ff7eb65bc53e75fb438ea1ca53ae2b3 Mon Sep 17 00:00:00 2001
From: Jatin Nagar <jatin.nagar@100ms.live>
Date: Sat, 18 May 2024 11:23:43 +0530
Subject: [PATCH 2/2] removed commented code

---
 .../hms/roomkit/ui/polls/PollQuestionViewHolder.kt   |  4 ----
 .../main/java/live/hms/roomkit/ui/theme/ThemeExt.kt  |  3 ---
 .../layout/layout_poll_question_creation_item.xml    | 12 ------------
 3 files changed, 19 deletions(-)

diff --git a/room-kit/src/main/java/live/hms/roomkit/ui/polls/PollQuestionViewHolder.kt b/room-kit/src/main/java/live/hms/roomkit/ui/polls/PollQuestionViewHolder.kt
index 1a3afab3c..076c8c1ba 100644
--- a/room-kit/src/main/java/live/hms/roomkit/ui/polls/PollQuestionViewHolder.kt
+++ b/room-kit/src/main/java/live/hms/roomkit/ui/polls/PollQuestionViewHolder.kt
@@ -101,10 +101,6 @@ class PollQuestionViewHolder<T : ViewBinding>(
     private fun bind(questionUi: QuestionUi.QuestionCreator) {
         with(binding as LayoutPollQuestionCreationItemBinding) {
             binding.applyTheme()
-//            <-- Removed `notRequiredToAnswer` switch for platform parity -->
-//            notRequiredToAnswer.setOnCheckedChangeListener { _, b ->
-//                getItem(bindingAdapterPosition).currentQuestion.requiredToAnswer = b
-//            }
             binding.askAQuestionEditText.setText(questionUi.currentQuestion.withTitle)
             binding.askAQuestionEditText.addTextChangedListener(object : TextWatcher {
                 override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
diff --git a/room-kit/src/main/java/live/hms/roomkit/ui/theme/ThemeExt.kt b/room-kit/src/main/java/live/hms/roomkit/ui/theme/ThemeExt.kt
index c058bf2cd..49cc20164 100644
--- a/room-kit/src/main/java/live/hms/roomkit/ui/theme/ThemeExt.kt
+++ b/room-kit/src/main/java/live/hms/roomkit/ui/theme/ThemeExt.kt
@@ -2528,9 +2528,6 @@ fun LayoutPollQuestionCreationItemBinding.applyTheme() {
     )
     )
 
-//    <-- Removed "Not Required To Answer" switch for platform parity -->
-//    setSwitchThemes(notRequiredToAnswer)
-
     saveButton.saveButtonEnabled()
 
 
diff --git a/room-kit/src/main/res/layout/layout_poll_question_creation_item.xml b/room-kit/src/main/res/layout/layout_poll_question_creation_item.xml
index 0c28948dd..b79fe74ec 100644
--- a/room-kit/src/main/res/layout/layout_poll_question_creation_item.xml
+++ b/room-kit/src/main/res/layout/layout_poll_question_creation_item.xml
@@ -129,18 +129,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/optionsListRadioGroupVG" />
 
-<!--        Removed `notRequiredToAnswer` switch for platform parity -->
-<!--        <com.google.android.material.switchmaterial.SwitchMaterial-->
-<!--            android:id="@+id/notRequiredToAnswer"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:text="Not required to answer"-->
-<!--            app:layout_constraintBottom_toTopOf="@+id/border"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintTop_toBottomOf="@+id/addAnOptionTextView"-->
-<!--            tools:visibility="visible" />-->
-
         <View
             android:id="@+id/border"
             android:layout_width="match_parent"