From dd32a17885727dd08390300ea606820a387a2c36 Mon Sep 17 00:00:00 2001
From: MohitGupta121 <guptamm.22@gmail.com>
Date: Tue, 25 Jul 2023 00:23:22 -0600
Subject: [PATCH 1/7] Implement dark mode for nps survey

---
 .../SurveyOnboardingBackgroundView.kt         |  2 +-
 .../rounded_button_white_background_color.xml |  4 ++--
 .../rounded_button_white_outline_color.xml    |  4 ++--
 .../survey_confirmation_dialog_background.xml |  2 +-
 .../survey_next_button_background.xml         |  7 -------
 .../survey_nps_radio_selected_color.xml       |  2 +-
 .../drawable/survey_nps_radio_text_color.xml  |  4 ++--
 .../survey_nps_radio_unselected_color.xml     |  2 +-
 .../survey_submit_button_background.xml       |  7 -------
 .../survey_exit_confirmation_dialog.xml       |  3 ++-
 app/src/main/res/layout/survey_fragment.xml   |  6 +++---
 .../res/layout/survey_free_form_layout.xml    |  1 +
 .../main/res/values-night/color_palette.xml   | 19 +++++++++++++++++++
 app/src/main/res/values/color_defs.xml        |  4 ++--
 app/src/main/res/values/color_palette.xml     | 14 ++++++++++++--
 app/src/main/res/values/component_colors.xml  | 12 +++++++++++-
 app/src/main/res/values/styles.xml            | 11 ++++++-----
 17 files changed, 66 insertions(+), 38 deletions(-)
 delete mode 100644 app/src/main/res/drawable/survey_next_button_background.xml
 delete mode 100644 app/src/main/res/drawable/survey_submit_button_background.xml

diff --git a/app/src/main/java/org/oppia/android/app/customview/SurveyOnboardingBackgroundView.kt b/app/src/main/java/org/oppia/android/app/customview/SurveyOnboardingBackgroundView.kt
index ba17796be34..4ef674dc6ab 100644
--- a/app/src/main/java/org/oppia/android/app/customview/SurveyOnboardingBackgroundView.kt
+++ b/app/src/main/java/org/oppia/android/app/customview/SurveyOnboardingBackgroundView.kt
@@ -94,7 +94,7 @@ class SurveyOnboardingBackgroundView : View {
       strokeWidth = this@SurveyOnboardingBackgroundView.strokeWidth
       color = ContextCompat.getColor(
         context,
-        R.color.component_color_survey_onboarding_background_color
+        R.color.component_color_survey_popup_background_color
       )
     }
     setBackgroundColor(Color.TRANSPARENT)
diff --git a/app/src/main/res/drawable/rounded_button_white_background_color.xml b/app/src/main/res/drawable/rounded_button_white_background_color.xml
index a11197bd37a..196f7707443 100644
--- a/app/src/main/res/drawable/rounded_button_white_background_color.xml
+++ b/app/src/main/res/drawable/rounded_button_white_background_color.xml
@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
   <corners android:radius="@dimen/survey_shared_corner_radius" />
-  <solid android:color="@color/component_color_survey_background_color" />
+  <solid android:color="@color/component_color_survey_white_button_color" />
   <stroke
     android:width="1dp"
-    android:color="@color/component_color_survey_primary_button_background_color" />
+    android:color="@color/component_color_shared_button_active_stroke_color" />
 </shape>
diff --git a/app/src/main/res/drawable/rounded_button_white_outline_color.xml b/app/src/main/res/drawable/rounded_button_white_outline_color.xml
index 9745cd92363..e0062e45189 100644
--- a/app/src/main/res/drawable/rounded_button_white_outline_color.xml
+++ b/app/src/main/res/drawable/rounded_button_white_outline_color.xml
@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
   <corners android:radius="@dimen/survey_shared_corner_radius" />
-  <solid android:color="@color/component_color_survey_primary_button_background_color" />
+  <solid android:color="@color/component_color_survey_green_button_color" />
   <stroke
     android:width="1dp"
-    android:color="@color/component_color_survey_shared_button_color" />
+    android:color="@color/component_color_survey_white_button_color" />
 </shape>
diff --git a/app/src/main/res/drawable/survey_confirmation_dialog_background.xml b/app/src/main/res/drawable/survey_confirmation_dialog_background.xml
index a8e76a82fd6..4ccc77e6490 100644
--- a/app/src/main/res/drawable/survey_confirmation_dialog_background.xml
+++ b/app/src/main/res/drawable/survey_confirmation_dialog_background.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
   <corners android:radius="@dimen/survey_shared_corner_radius" />
-  <solid android:color="@color/component_color_shared_white_background_color" />
+  <solid android:color="@color/component_color_shared_screen_primary_background_color" />
   <stroke
     android:width="2dp"
     android:color="@color/component_color_survey_dialog_stroke_color" />
diff --git a/app/src/main/res/drawable/survey_next_button_background.xml b/app/src/main/res/drawable/survey_next_button_background.xml
deleted file mode 100644
index de55a5e10e0..00000000000
--- a/app/src/main/res/drawable/survey_next_button_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <!-- Enabled state -->
-  <item android:drawable="@drawable/rounded_primary_button_grey_shadow_color" android:state_enabled="true" />
-  <!-- Disabled state -->
-  <item android:drawable="@drawable/survey_rounded_disabled_button_background" android:state_enabled="false" />
-</selector>
diff --git a/app/src/main/res/drawable/survey_nps_radio_selected_color.xml b/app/src/main/res/drawable/survey_nps_radio_selected_color.xml
index c62b0773a38..0019620da24 100644
--- a/app/src/main/res/drawable/survey_nps_radio_selected_color.xml
+++ b/app/src/main/res/drawable/survey_nps_radio_selected_color.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="48dp"
   android:height="48dp"
-  android:tint="#15716A"
+  android:tint="@color/component_color_survey_nps_selected_background_color"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0">
   <path
diff --git a/app/src/main/res/drawable/survey_nps_radio_text_color.xml b/app/src/main/res/drawable/survey_nps_radio_text_color.xml
index 4d28037d434..80786dea646 100644
--- a/app/src/main/res/drawable/survey_nps_radio_text_color.xml
+++ b/app/src/main/res/drawable/survey_nps_radio_text_color.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="@color/component_color_shared_secondary_4_text_color" android:state_enabled="true" />
-  <item android:color="@color/component_color_shared_active_text_color" android:state_enabled="false" />
+  <item android:color="@color/component_color_survey_nps_selected_text_color" android:state_enabled="true" />
+  <item android:color="@color/component_color_survey_nps_unselected_text_color" android:state_enabled="false" />
 </selector>
diff --git a/app/src/main/res/drawable/survey_nps_radio_unselected_color.xml b/app/src/main/res/drawable/survey_nps_radio_unselected_color.xml
index b2665b4d899..ac3f393f2fe 100644
--- a/app/src/main/res/drawable/survey_nps_radio_unselected_color.xml
+++ b/app/src/main/res/drawable/survey_nps_radio_unselected_color.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="48dp"
   android:height="48dp"
-  android:tint="#E2F5F4"
+  android:tint="@color/component_color_survey_nps_unselected_background_color"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0">
   <path
diff --git a/app/src/main/res/drawable/survey_submit_button_background.xml b/app/src/main/res/drawable/survey_submit_button_background.xml
deleted file mode 100644
index f59c05a5547..00000000000
--- a/app/src/main/res/drawable/survey_submit_button_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <!-- Enabled state -->
-  <item android:drawable="@drawable/primary_rounded_button" android:state_enabled="true" />
-  <!-- Disabled state -->
-  <item android:drawable="@drawable/survey_rounded_disabled_button_background" android:state_enabled="false" />
-</selector>
diff --git a/app/src/main/res/layout/survey_exit_confirmation_dialog.xml b/app/src/main/res/layout/survey_exit_confirmation_dialog.xml
index 78128ced3dd..fbbfe690df1 100644
--- a/app/src/main/res/layout/survey_exit_confirmation_dialog.xml
+++ b/app/src/main/res/layout/survey_exit_confirmation_dialog.xml
@@ -11,7 +11,8 @@
       style="@style/SurveyQuestionTextStyle"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_margin="@dimen/survey_question_text_margin"
+      android:layout_marginStart="@dimen/survey_question_text_margin"
+      android:layout_marginEnd="@dimen/survey_question_text_margin"
       android:text="@string/survey_exit_confirmation_text"
       app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layout/survey_fragment.xml b/app/src/main/res/layout/survey_fragment.xml
index 07f6770a3d5..b12beec427d 100644
--- a/app/src/main/res/layout/survey_fragment.xml
+++ b/app/src/main/res/layout/survey_fragment.xml
@@ -28,10 +28,10 @@
         android:id="@+id/survey_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/component_color_shared_secondary_toolbar_color"
+        android:background="@color/component_color_shared_activity_toolbar_color"
+        android:contentDescription="@string/survey_exit_button_description"
         android:minHeight="?attr/actionBarSize"
         android:theme="@style/Widget.AppCompat.ActionBar"
-        android:contentDescription="@string/survey_exit_button_description"
         app:navigationIcon="@drawable/ic_close_white_24dp">
 
         <LinearLayout
@@ -127,7 +127,7 @@
           style="@style/SurveyNextButton"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:background="@drawable/survey_next_button_background"
+          android:background="@{viewModel.canMoveToNextQuestion ? @drawable/state_button_primary_background : @drawable/state_button_inactive_background}"
           android:enabled="@{viewModel.canMoveToNextQuestion}"
           android:text="@string/next"
           android:textColor="@{viewModel.canMoveToNextQuestion ? @color/component_color_shared_secondary_4_text_color : @color/component_color_survey_disabled_button_text_color}"
diff --git a/app/src/main/res/layout/survey_free_form_layout.xml b/app/src/main/res/layout/survey_free_form_layout.xml
index fbaead829bf..1a1dc5238a2 100644
--- a/app/src/main/res/layout/survey_free_form_layout.xml
+++ b/app/src/main/res/layout/survey_free_form_layout.xml
@@ -32,6 +32,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/survey_navigation_buttons_margin"
+      android:background="@{viewModel.isAnswerAvailable() ? @drawable/state_button_primary_background : @drawable/state_button_inactive_background}"
       android:clickable="@{viewModel.isAnswerAvailable()}"
       android:enabled="@{viewModel.isAnswerAvailable()}"
       android:onClick="@{(v) ->viewModel.handleSubmitButtonClicked()}"
diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml
index 6b9797a1a45..7f072ae0350 100644
--- a/app/src/main/res/values-night/color_palette.xml
+++ b/app/src/main/res/values-night/color_palette.xml
@@ -204,4 +204,23 @@
   <color name="color_palette_onboarding_4_status_bar_color">@color/color_def_onboarding_4_status_bar</color>
   <color name="color_palette_coming_soon_rect_background_end_color">@color/color_def_grape_violet</color>
   <color name="color_palette_coming_soon_rect_background_start_color">@color/color_def_bright_violet</color>
+  <!-- SURVEY -->
+  <color name="color_palette_survey_background_color">@color/color_def_oppia_light_black</color>
+  <color name="color_palette_survey_shared_button_color">@color/color_def_white_f6</color>
+  <color name="color_palette_survey_previous_button_text_color">@color/color_def_dark_turquoise</color>
+  <color name="color_palette_survey_popup_header_color">@color/color_def_white_f5</color>
+  <color name="color_palette_survey_popup_background_color">@color/color_def_dark_green</color>
+  <color name="color_palette_survey_popup_message_color">@color/color_def_white</color>
+  <color name="color_palette_survey_white_button_color">@color/color_def_white_f6</color>
+  <color name="color_palette_survey_green_button_color">@color/color_def_dark_green</color>
+  <color name="color_palette_survey_dialog_stroke_color">@color/color_def_light_blue</color>
+  <color name="color_palette_survey_radio_button_color">@color/color_def_white</color>
+  <color name="color_palette_survey_disabled_button_color">@color/color_def_oppia_grayish_black</color>
+  <color name="color_palette_survey_disabled_button_text_color">@color/color_def_chooser_grey</color>
+  <color name="color_palette_button_text_color">@color/color_def_oppia_green</color>
+  <color name="color_palette_edit_text_unselected_color">@color/color_def_grey</color>
+  <color name="color_palette_nps_unselected_text_color">@color/color_def_dark_green</color>
+  <color name="color_palette_nps_selected_text_color">@color/color_def_white</color>
+  <color name="color_palette_nps_selected_background_color">@color/color_def_dark_green</color>
+  <color name="color_palette_nps_unselected_background_color">@color/color_def_pale_green</color>
 </resources>
diff --git a/app/src/main/res/values/color_defs.xml b/app/src/main/res/values/color_defs.xml
index 27498356b7e..446a12a3a70 100644
--- a/app/src/main/res/values/color_defs.xml
+++ b/app/src/main/res/values/color_defs.xml
@@ -137,8 +137,8 @@
   <color name="color_def_avatar_background_22">#AB29CC</color>
   <color name="color_def_avatar_background_23">#CC29B1</color>
   <color name="color_def_avatar_background_24">#CC2970</color>
-  <color name="color_def_survey_background">#F5F5F5</color>
-  <color name="color_def_survey_buttons_white">#F6F6F6</color>
+  <color name="color_def_white_f5">#F5F5F5</color>
+  <color name="color_def_white_f6">#F6F6F6</color>
   <color name="color_def_light_blue">#BDCCCC</color>
   
   <color name="color_def_survey_disabled_button_grey">#E8E8E8</color>
diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml
index 0c34c6b9f99..56601a32426 100644
--- a/app/src/main/res/values/color_palette.xml
+++ b/app/src/main/res/values/color_palette.xml
@@ -245,8 +245,18 @@
   <color name="color_palette_avatar_background_23_color">@color/color_def_avatar_background_23</color>
   <color name="color_palette_avatar_background_24_color">@color/color_def_avatar_background_24</color>
   <!-- SURVEY -->
-  <color name="color_palette_survey_background_color">@color/color_def_survey_background</color>
-  <color name="color_palette_survey_shared_button_color">@color/color_def_survey_buttons_white</color>
+  <color name="color_palette_survey_background_color">@color/color_def_white_f5</color>
+  <color name="color_palette_survey_shared_button_color">@color/color_def_white_f6</color>
+  <color name="color_palette_survey_previous_button_text_color">@color/color_def_oppia_green</color>
+  <color name="color_palette_survey_popup_header_color">@color/color_def_oppia_green</color>
+  <color name="color_palette_survey_popup_background_color">@color/color_def_oppia_green</color>
+  <color name="color_palette_survey_popup_message_color">@color/color_def_white</color>
+  <color name="color_palette_survey_white_button_color">@color/color_def_white_f6</color>
+  <color name="color_palette_survey_green_button_color">@color/color_def_oppia_green</color>
+  <color name="color_palette_nps_unselected_text_color">@color/color_def_oppia_green</color>
+  <color name="color_palette_nps_selected_text_color">@color/color_def_white</color>
+  <color name="color_palette_nps_selected_background_color">@color/color_def_oppia_green</color>
+  <color name="color_palette_nps_unselected_background_color">@color/color_def_pale_green</color>
   <color name="color_palette_survey_dialog_stroke_color">@color/color_def_light_blue</color>
   <color name="color_palette_survey_radio_button_color">@color/color_def_accessible_grey</color>
   <color name="color_palette_survey_disabled_button_color">@color/color_def_survey_disabled_button_grey</color>
diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml
index 59b36435596..08c6285a6e8 100644
--- a/app/src/main/res/values/component_colors.xml
+++ b/app/src/main/res/values/component_colors.xml
@@ -280,7 +280,17 @@
   <!-- Survey Activity -->
   <color name="component_color_survey_background_color">@color/color_palette_survey_background_color</color>
   <color name="component_color_survey_shared_button_color">@color/color_palette_survey_shared_button_color</color>
-  <color name="component_color_survey_onboarding_background_color">@color/color_palette_primary_color</color>
+  <color name="component_color_survey_previous_button_text_color">@color/color_palette_survey_previous_button_text_color</color>
+  <color name="component_color_survey_popup_header_text_color">@color/color_palette_survey_popup_header_color</color>
+  <color name="component_color_survey_popup_message_color">@color/color_palette_survey_popup_message_color</color>
+  <color name="component_color_survey_popup_background_color">@color/color_palette_survey_popup_background_color</color>
+  <color name="component_color_survey_white_button_color">@color/color_palette_survey_shared_button_color</color>
+  <color name="component_color_survey_green_button_color">@color/color_palette_survey_green_button_color</color>
+  <color name="component_color_survey_progress_bar_color">@color/color_palette_toolbar_color</color>
+  <color name="component_color_survey_nps_unselected_text_color">@color/color_palette_nps_unselected_text_color</color>
+  <color name="component_color_survey_nps_selected_text_color">@color/color_palette_nps_selected_text_color</color>
+  <color name="component_color_survey_nps_unselected_background_color">@color/color_palette_nps_unselected_background_color</color>
+  <color name="component_color_survey_nps_selected_background_color">@color/color_palette_nps_selected_background_color</color>
   <color name="component_color_survey_primary_button_background_color">@color/color_palette_primary_color</color>
   <color name="component_color_survey_dialog_stroke_color">@color/color_palette_survey_dialog_stroke_color</color>
   <color name="component_color_survey_radio_button_unchecked_color">@color/color_palette_survey_radio_button_color</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c86d564fef6..3738d2d993b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -558,7 +558,7 @@
     <item name="android:fontFamily">sans-serif-medium</item>
     <item name="android:minHeight">@dimen/clickable_item_min_height</item>
     <item name="android:textAllCaps">true</item>
-    <item name="android:textColor">@color/component_color_shared_secondary_button_background_trim_color</item>
+    <item name="android:textColor">@color/component_color_survey_previous_button_text_color</item>
     <item name="android:textSize">14sp</item>
   </style>
 
@@ -568,6 +568,7 @@
     <item name="android:gravity">center</item>
     <item name="android:minWidth">144dp</item>
     <item name="android:layout_margin">@dimen/survey_navigation_buttons_margin</item>
+    <item name="android:background">@drawable/state_button_primary_background</item>
     <item name="android:fontFamily">sans-serif-medium</item>
     <item name="android:minHeight">@dimen/clickable_item_min_height</item>
     <item name="android:textAllCaps">true</item>
@@ -580,7 +581,7 @@
     <item name="android:paddingEnd">12dp</item>
     <item name="android:paddingStart">12dp</item>
     <item name="android:minWidth">144dp</item>
-    <item name="android:background">@drawable/survey_submit_button_background</item>
+    <item name="android:background">@drawable/state_button_primary_background</item>
     <item name="android:fontFamily">sans-serif-medium</item>
     <item name="android:minHeight">@dimen/clickable_item_min_height</item>
     <item name="android:textAllCaps">true</item>
@@ -612,7 +613,7 @@
   <style name="SurveyPopupHeaderStyle" parent="TextViewCenterHorizontal">
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>
-    <item name="android:textColor">@color/component_color_shared_active_text_color</item>
+    <item name="android:textColor">@color/component_color_survey_popup_header_text_color</item>
     <item name="android:layout_margin">@dimen/survey_text_margin</item>
     <item name="android:textSize">@dimen/survey_popup_header_text_size</item>
     <item name="android:fontFamily">sans-serif</item>
@@ -621,7 +622,7 @@
   <style name="SurveyPopupMessageStyle" parent="TextViewStart">
     <item name="android:layout_width">match_parent</item>
     <item name="android:layout_height">wrap_content</item>
-    <item name="android:textColor">@color/component_color_shared_secondary_4_text_color</item>
+    <item name="android:textColor">@color/component_color_survey_popup_message_color</item>
     <item name="android:layout_margin">@dimen/survey_popup_message_margin</item>
     <item name="android:textSize">@dimen/survey_popup_message_text_size</item>
     <item name="android:fontFamily">sans-serif</item>
@@ -648,7 +649,7 @@
     <item name="android:windowIsFloating">false</item>
     <!-- This is important! Don't forget to set window background -->
     <item name="android:windowIsTranslucent">false</item>
-    <item name="android:windowBackground">@color/color_palette_shared_white_background_color</item>
+    <item name="android:windowBackground">@color/component_color_survey_background_color</item>
     <!-- Additionally if you want animations when dialog opening -->
     <item name="android:windowEnterAnimation">@anim/slide_up</item>
     <item name="android:windowExitAnimation">@anim/slide_down</item>

From d7da9e867c73f76c0ceb8839754df4e842176fbf Mon Sep 17 00:00:00 2001
From: MohitGupta121 <guptamm.22@gmail.com>
Date: Tue, 25 Jul 2023 13:45:28 -0600
Subject: [PATCH 2/7] progress bar survey dark-mode

---
 app/src/main/res/drawable/survey_progress_bar.xml | 4 ++--
 app/src/main/res/values-night/color_palette.xml   | 1 +
 app/src/main/res/values/color_palette.xml         | 1 +
 app/src/main/res/values/component_colors.xml      | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/drawable/survey_progress_bar.xml b/app/src/main/res/drawable/survey_progress_bar.xml
index f31fa6cfdf6..3eab6c3074c 100644
--- a/app/src/main/res/drawable/survey_progress_bar.xml
+++ b/app/src/main/res/drawable/survey_progress_bar.xml
@@ -10,10 +10,10 @@
     <scale android:scaleWidth="100%">
       <shape>
         <corners android:radius="0dp" />
-        <solid android:color="@color/component_color_shared_progress_bar_solid_color" />
+        <solid android:color="@color/component_color_survey_progress_bar_solid_color" />
         <stroke
           android:width="1dp"
-          android:color="@color/component_color_shared_progress_bar_background_color" />
+          android:color="@color/component_color_shared_white_background_color" />
       </shape>
     </scale>
   </item>
diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml
index 7f072ae0350..0becb8a1dd6 100644
--- a/app/src/main/res/values-night/color_palette.xml
+++ b/app/src/main/res/values-night/color_palette.xml
@@ -208,6 +208,7 @@
   <color name="color_palette_survey_background_color">@color/color_def_oppia_light_black</color>
   <color name="color_palette_survey_shared_button_color">@color/color_def_white_f6</color>
   <color name="color_palette_survey_previous_button_text_color">@color/color_def_dark_turquoise</color>
+  <color name="color_palette_survey_progress_bar_solid_color">@color/color_def_oppia_green</color>
   <color name="color_palette_survey_popup_header_color">@color/color_def_white_f5</color>
   <color name="color_palette_survey_popup_background_color">@color/color_def_dark_green</color>
   <color name="color_palette_survey_popup_message_color">@color/color_def_white</color>
diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml
index 56601a32426..751c98a0e3c 100644
--- a/app/src/main/res/values/color_palette.xml
+++ b/app/src/main/res/values/color_palette.xml
@@ -248,6 +248,7 @@
   <color name="color_palette_survey_background_color">@color/color_def_white_f5</color>
   <color name="color_palette_survey_shared_button_color">@color/color_def_white_f6</color>
   <color name="color_palette_survey_previous_button_text_color">@color/color_def_oppia_green</color>
+  <color name="color_palette_survey_progress_bar_solid_color">@color/color_def_oppia_green</color>
   <color name="color_palette_survey_popup_header_color">@color/color_def_oppia_green</color>
   <color name="color_palette_survey_popup_background_color">@color/color_def_oppia_green</color>
   <color name="color_palette_survey_popup_message_color">@color/color_def_white</color>
diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml
index 08c6285a6e8..b3fd4c17a70 100644
--- a/app/src/main/res/values/component_colors.xml
+++ b/app/src/main/res/values/component_colors.xml
@@ -281,6 +281,7 @@
   <color name="component_color_survey_background_color">@color/color_palette_survey_background_color</color>
   <color name="component_color_survey_shared_button_color">@color/color_palette_survey_shared_button_color</color>
   <color name="component_color_survey_previous_button_text_color">@color/color_palette_survey_previous_button_text_color</color>
+  <color name="component_color_survey_progress_bar_solid_color">@color/color_palette_survey_progress_bar_solid_color</color>
   <color name="component_color_survey_popup_header_text_color">@color/color_palette_survey_popup_header_color</color>
   <color name="component_color_survey_popup_message_color">@color/color_palette_survey_popup_message_color</color>
   <color name="component_color_survey_popup_background_color">@color/color_palette_survey_popup_background_color</color>

From 8be16225c3a90b7a2120424c2f9034607f465b5f Mon Sep 17 00:00:00 2001
From: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
Date: Mon, 31 Jul 2023 02:24:59 -0700
Subject: [PATCH 3/7] Fix Part of #5086: Add Layout Land for Survey UI (#5110)

## Explanation
Fix Part of #5086: We found that the navigation buttons in some
questions were not displaying correctly in landscape mode on phones.
This issue affects the survey popup as well. See
https://github.com/oppia/oppia-android/pull/5104#issuecomment-1649935209.

This PR introduces dedicated landscape layouts for the affected screens.

There are some minor bug fixes/ ux improvements also added that are
related to the survey behaviour:
1. Make the exit confirmation dialog non-cancelable so that the user
makes use of the dialog buttons.
2.Prevent accidentally exiting the survey by showing the exit
confirmation dialog on backpress.
3. Resume normal flow on exiting an exploration, when the survey is not
to be shown.

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [ ] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [ ] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only

### Before

![image](https://github.com/oppia/oppia-android/assets/59600948/46b76a8e-82f3-4dd3-9f95-d83268ccf9a5)

### After
![Screenshot 2023-07-28 at 00 25
19](https://github.com/oppia/oppia-android/assets/59600948/c9518e0b-d610-4532-91ce-d23b80e4dd1a)

### Before+Light Mode, After+Dark Mode
![Screenshot 2023-07-28 at 01 32
02](https://github.com/oppia/oppia-android/assets/59600948/89fbbdb5-7905-4afb-abb4-6bfd041466ae)

### Before+Light Mode, After+Dark Mode
![Screenshot 2023-07-28 at 01 40
50](https://github.com/oppia/oppia-android/assets/59600948/88ba0852-a95d-4b86-bc2f-2682da5908b0)
---
 app/src/main/AndroidManifest.xml              |   2 +-
 .../ExplorationActivityPresenter.kt           |   4 +-
 .../ExitSurveyConfirmationDialogFragment.kt   |   3 +
 .../android/app/survey/SurveyActivity.kt      |  11 +-
 .../SurveyWelcomeDialogFragmentPresenter.kt   |   5 +-
 .../main/res/layout-land/survey_fragment.xml  | 146 ++++++++++++++++++
 .../survey_welcome_dialog_fragment.xml        |  68 ++++++++
 .../survey_welcome_dialog_fragment.xml        |  68 ++++++++
 app/src/main/res/layout/survey_fragment.xml   |   2 +
 app/src/main/res/values/dimens.xml            |   1 +
 10 files changed, 305 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/layout-land/survey_fragment.xml
 create mode 100644 app/src/main/res/layout-land/survey_welcome_dialog_fragment.xml
 create mode 100644 app/src/main/res/layout-w600dp/survey_welcome_dialog_fragment.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bad515549bb..a27551a2005 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -311,7 +311,7 @@
       android:name=".app.survey.SurveyActivity"
       android:label="@string/survey_activity_title"
       android:theme="@style/OppiaThemeWithoutActionBar"
-      android:windowSoftInputMode="adjustResize" />
+      android:windowSoftInputMode="adjustNothing" />
 
     <provider
       android:name="androidx.work.impl.WorkManagerInitializer"
diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
index e1d7857e85c..5d1d0414196 100644
--- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
@@ -286,6 +286,8 @@ class ExplorationActivityPresenter @Inject constructor(
               oppiaLogger.d("ExplorationActivity", "Successfully stopped exploration")
               if (isCompletion) {
                 maybeShowSurveyDialog(profileId, topicId)
+              } else {
+                backPressActivitySelector()
               }
             }
           }
@@ -310,8 +312,6 @@ class ExplorationActivityPresenter @Inject constructor(
    * current exploration.
    */
   fun backButtonPressed() {
-    // check if survey should be shown
-    maybeShowSurveyDialog(profileId, topicId)
     // If checkpointing is not enabled, show StopExplorationDialogFragment to exit the exploration,
     // this is expected to happen if the exploration is marked as completed.
     if (!isCheckpointingEnabled) {
diff --git a/app/src/main/java/org/oppia/android/app/survey/ExitSurveyConfirmationDialogFragment.kt b/app/src/main/java/org/oppia/android/app/survey/ExitSurveyConfirmationDialogFragment.kt
index 9ee7d511b19..f111bafbec6 100644
--- a/app/src/main/java/org/oppia/android/app/survey/ExitSurveyConfirmationDialogFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/survey/ExitSurveyConfirmationDialogFragment.kt
@@ -61,6 +61,9 @@ class ExitSurveyConfirmationDialogFragment : InjectableDialogFragment() {
 
     val profileId = args.getProto(PROFILE_ID_KEY, ProfileId.getDefaultInstance())
 
+    dialog?.setCanceledOnTouchOutside(false)
+    dialog?.setCancelable(false)
+
     return exitSurveyConfirmationDialogFragmentPresenter.handleCreateView(
       inflater,
       container
diff --git a/app/src/main/java/org/oppia/android/app/survey/SurveyActivity.kt b/app/src/main/java/org/oppia/android/app/survey/SurveyActivity.kt
index c4751b06705..12d5b7220ee 100644
--- a/app/src/main/java/org/oppia/android/app/survey/SurveyActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/survey/SurveyActivity.kt
@@ -18,18 +18,27 @@ class SurveyActivity : InjectableAutoLocalizedAppCompatActivity() {
   @Inject
   lateinit var surveyActivityPresenter: SurveyActivityPresenter
 
+  private lateinit var profileId: ProfileId
+
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
 
     val params = intent.extractParams()
+    this.profileId = params.profileId ?: ProfileId.newBuilder().setInternalId(-1).build()
+
     surveyActivityPresenter.handleOnCreate(
-      params.profileId,
+      profileId,
       params.topicId,
       params.explorationId
     )
   }
 
+  override fun onBackPressed() {
+    val dialogFragment = ExitSurveyConfirmationDialogFragment.newInstance(profileId)
+    dialogFragment.showNow(supportFragmentManager, TAG_EXIT_SURVEY_CONFIRMATION_DIALOG)
+  }
+
   companion object {
     private const val PARAMS_KEY = "SurveyActivity.params"
 
diff --git a/app/src/main/java/org/oppia/android/app/survey/SurveyWelcomeDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/survey/SurveyWelcomeDialogFragmentPresenter.kt
index da4f62c3ef2..bc24dfacd60 100644
--- a/app/src/main/java/org/oppia/android/app/survey/SurveyWelcomeDialogFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/survey/SurveyWelcomeDialogFragmentPresenter.kt
@@ -11,6 +11,7 @@ import org.oppia.android.app.model.SurveyQuestionName
 import org.oppia.android.databinding.SurveyWelcomeDialogFragmentBinding
 import org.oppia.android.domain.oppialogger.OppiaLogger
 import org.oppia.android.domain.oppialogger.analytics.AnalyticsController
+import org.oppia.android.domain.profile.ProfileManagementController
 import org.oppia.android.domain.survey.SurveyController
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
@@ -25,7 +26,8 @@ class SurveyWelcomeDialogFragmentPresenter @Inject constructor(
   private val fragment: Fragment,
   private val surveyController: SurveyController,
   private val oppiaLogger: OppiaLogger,
-  private val analyticsController: AnalyticsController
+  private val analyticsController: AnalyticsController,
+  private val profileManagementController: ProfileManagementController
 ) {
   private lateinit var explorationId: String
 
@@ -54,6 +56,7 @@ class SurveyWelcomeDialogFragmentPresenter @Inject constructor(
         .commitNow()
     }
 
+    profileManagementController.updateSurveyLastShownTimestamp(profileId)
     logSurveyPopUpShownEvent(explorationId, topicId, profileId)
 
     return binding.root
diff --git a/app/src/main/res/layout-land/survey_fragment.xml b/app/src/main/res/layout-land/survey_fragment.xml
new file mode 100644
index 00000000000..d1358390ce6
--- /dev/null
+++ b/app/src/main/res/layout-land/survey_fragment.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools">
+
+  <data>
+
+    <variable
+      name="viewModel"
+      type="org.oppia.android.app.survey.SurveyViewModel" />
+  </data>
+
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/component_color_survey_background_color">
+
+    <com.google.android.material.appbar.AppBarLayout
+      android:id="@+id/survey_app_bar_layout"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent">
+
+      <androidx.appcompat.widget.Toolbar
+        android:id="@+id/survey_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/component_color_shared_activity_toolbar_color"
+        android:contentDescription="@string/survey_exit_button_description"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="@style/Widget.AppCompat.ActionBar"
+        app:navigationIcon="@drawable/ic_close_white_24dp">
+
+        <LinearLayout
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:orientation="horizontal">
+
+          <ProgressBar
+            android:id="@+id/survey_progress_bar"
+            style="@android:style/Widget.ProgressBar.Horizontal"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/survey_progress_bar_height"
+            android:layout_weight="1"
+            android:max="100"
+            android:progress="@{viewModel.progressPercentage}"
+            android:progressDrawable="@drawable/survey_progress_bar" />
+
+          <TextView
+            android:id="@+id/survey_progress_text"
+            style="@style/TextViewCenter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/survey_progress_text_margin_start"
+            android:layout_marginEnd="@dimen/survey_progress_text_margin_end"
+            android:fontFamily="sans-serif"
+            android:text="@{viewModel.questionProgressText}"
+            android:textColor="@color/component_color_shared_secondary_4_text_color"
+            android:textSize="14sp"
+            tools:text="25%" />
+        </LinearLayout>
+      </androidx.appcompat.widget.Toolbar>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+      android:id="@+id/survey_content_container"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/survey_app_bar_layout">
+
+      <TextView
+        android:id="@+id/survey_question_text"
+        style="@style/TextViewStart"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/survey_question_text_margin"
+        android:layout_marginTop="@dimen/survey_question_text_margin"
+        android:layout_marginEnd="@dimen/survey_question_text_margin"
+        android:fontFamily="sans-serif-medium"
+        android:text="@{viewModel.questionText}"
+        android:textColor="@color/component_color_shared_primary_text_color"
+        android:textSize="18sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Please select one of the following:" />
+
+      <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/survey_answers_recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/survey_question_recycler_view_margin"
+        android:layout_marginTop="@dimen/survey_question_recycler_view_margin"
+        android:layout_marginEnd="@dimen/survey_question_recycler_view_margin"
+        android:clipToPadding="false"
+        android:overScrollMode="never"
+        android:scrollbars="none"
+        app:data="@{viewModel.itemList}"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constraintTop_toBottomOf="@id/survey_question_text"
+        tools:itemCount="1" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <FrameLayout
+      android:id="@+id/survey_buttons_layout"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/survey_navigation_buttons_container_margin"
+      android:layout_marginBottom="@dimen/survey_navigation_buttons_container_margin"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent">
+
+      <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/survey_navigation_buttons_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <Button
+          android:id="@+id/survey_previous_button"
+          style="@style/SurveyPreviousButton"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:text="@string/survey_previous_button"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent" />
+
+        <Button
+          android:id="@+id/survey_next_button"
+          style="@style/SurveyNextButton"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:background="@{viewModel.canMoveToNextQuestion ? @drawable/state_button_primary_background : @drawable/state_button_inactive_background}"
+          android:enabled="@{viewModel.canMoveToNextQuestion}"
+          android:text="@string/next"
+          android:textColor="@{viewModel.canMoveToNextQuestion ? @color/component_color_shared_secondary_4_text_color : @color/component_color_survey_disabled_button_text_color}"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintTop_toTopOf="parent" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+    </FrameLayout>
+  </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/app/src/main/res/layout-land/survey_welcome_dialog_fragment.xml b/app/src/main/res/layout-land/survey_welcome_dialog_fragment.xml
new file mode 100644
index 00000000000..9a41b4cf558
--- /dev/null
+++ b/app/src/main/res/layout-land/survey_welcome_dialog_fragment.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+      android:id="@+id/survey_onboarding_title_text"
+      style="@style/SurveyPopupHeaderStyle"
+      android:text="@string/survey_onboarding_title_text"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintBottom_toTopOf="@id/survey_onboarding_title_guide"
+      app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.Guideline
+      android:id="@+id/survey_onboarding_title_guide"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:orientation="horizontal"
+      app:layout_constraintGuide_percent="0.10" />
+
+    <org.oppia.android.app.customview.SurveyOnboardingBackgroundView
+      android:id="@+id/survey_onboarding_background"
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      app:layout_constraintTop_toBottomOf="@id/survey_onboarding_title_guide" />
+
+    <androidx.constraintlayout.widget.Guideline
+      android:id="@+id/survey_onboarding_center_guide"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:orientation="horizontal"
+      app:layout_constraintGuide_percent="0.20" />
+
+    <TextView
+      android:id="@+id/survey_onboarding_text"
+      style="@style/SurveyPopupMessageStyle"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      android:text="@string/survey_onboarding_message_text"
+      app:layout_constraintTop_toTopOf="@id/survey_onboarding_center_guide" />
+
+    <Button
+      android:id="@+id/begin_survey_button"
+      style="@style/SurveyPrimaryButton"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:text="@string/survey_begin_survey_button"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/survey_onboarding_text"
+      app:layout_constraintVertical_chainStyle="packed" />
+
+    <Button
+      android:id="@+id/maybe_later_button"
+      style="@style/SurveySecondaryButton"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/survey_navigation_buttons_margin"
+      android:text="@string/survey_maybe_later_button"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/begin_survey_button" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/app/src/main/res/layout-w600dp/survey_welcome_dialog_fragment.xml b/app/src/main/res/layout-w600dp/survey_welcome_dialog_fragment.xml
new file mode 100644
index 00000000000..d140d187690
--- /dev/null
+++ b/app/src/main/res/layout-w600dp/survey_welcome_dialog_fragment.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+      android:id="@+id/survey_onboarding_title_text"
+      style="@style/SurveyPopupHeaderStyle"
+      android:text="@string/survey_onboarding_title_text"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintBottom_toTopOf="@id/survey_onboarding_title_guide"
+      app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.Guideline
+      android:id="@+id/survey_onboarding_title_guide"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:orientation="horizontal"
+      app:layout_constraintGuide_percent="0.10" />
+
+    <org.oppia.android.app.customview.SurveyOnboardingBackgroundView
+      android:id="@+id/survey_onboarding_background"
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      app:layout_constraintTop_toBottomOf="@id/survey_onboarding_title_guide" />
+
+    <androidx.constraintlayout.widget.Guideline
+      android:id="@+id/survey_onboarding_center_guide"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:orientation="horizontal"
+      app:layout_constraintGuide_percent="0.25" />
+
+    <TextView
+      android:id="@+id/survey_onboarding_text"
+      style="@style/SurveyPopupMessageStyle"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      android:text="@string/survey_onboarding_message_text"
+      app:layout_constraintTop_toTopOf="@id/survey_onboarding_center_guide" />
+
+    <Button
+      android:id="@+id/begin_survey_button"
+      style="@style/SurveyPrimaryButton"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:text="@string/survey_begin_survey_button"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/survey_onboarding_text"
+      app:layout_constraintVertical_chainStyle="packed" />
+
+    <Button
+      android:id="@+id/maybe_later_button"
+      style="@style/SurveySecondaryButton"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/survey_navigation_buttons_margin"
+      android:text="@string/survey_maybe_later_button"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/begin_survey_button" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/app/src/main/res/layout/survey_fragment.xml b/app/src/main/res/layout/survey_fragment.xml
index b12beec427d..f96a442a1d9 100644
--- a/app/src/main/res/layout/survey_fragment.xml
+++ b/app/src/main/res/layout/survey_fragment.xml
@@ -66,6 +66,7 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
+      android:id="@+id/survey_content_container"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       app:layout_constraintEnd_toEndOf="parent"
@@ -102,6 +103,7 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <FrameLayout
+      android:id="@+id/survey_buttons_layout"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 2211fe16ec0..f3a61db0ee7 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -777,6 +777,7 @@
   <dimen name="survey_question_text_margin">28dp</dimen>
   <dimen name="survey_question_recycler_view_margin">28dp</dimen>
   <dimen name="survey_navigation_buttons_margin">28dp</dimen>
+  <dimen name="survey_navigation_buttons_container_margin">14dp</dimen>
   <dimen name="survey_shared_corner_radius">4dp</dimen>
   <dimen name="survey_popup_header_text_size">28sp</dimen>
   <dimen name="survey_popup_message_text_size">14sp</dimen>

From a7197d711dc34b1a1225abcaeb084c01584f3238 Mon Sep 17 00:00:00 2001
From: MohitGupta121 <guptamm.22@gmail.com>
Date: Mon, 31 Jul 2023 15:29:52 -0600
Subject: [PATCH 4/7] fix designer changes

---
 .../ExplorationActivityPresenter.kt           | 92 +++++++++++--------
 .../drawable/nps_survey_button_background.xml |  9 ++
 .../nps_survey_button_inactive_background.xml |  9 ++
 .../res/layout/survey_free_form_layout.xml    |  2 +-
 .../main/res/values-night/color_palette.xml   |  3 +-
 app/src/main/res/values/color_palette.xml     |  1 +
 app/src/main/res/values/component_colors.xml  |  1 +
 app/src/main/res/values/styles.xml            | 12 +--
 8 files changed, 81 insertions(+), 48 deletions(-)
 create mode 100644 app/src/main/res/drawable/nps_survey_button_background.xml
 create mode 100644 app/src/main/res/drawable/nps_survey_button_inactive_background.xml

diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
index 5d1d0414196..a500f2164b6 100644
--- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
@@ -269,7 +269,7 @@ class ExplorationActivityPresenter @Inject constructor(
         profileId, oldestCheckpointExplorationId
       )
     }
-    stopExploration(isCompletion = false)
+    stopExploration(isCompletion = true)
   }
 
   fun stopExploration(isCompletion: Boolean) {
@@ -278,6 +278,7 @@ class ExplorationActivityPresenter @Inject constructor(
       .observe(
         activity,
         {
+          maybeShowSurveyDialog(profileId, topicId)
           when (it) {
             is AsyncResult.Pending -> oppiaLogger.d("ExplorationActivity", "Stopping exploration")
             is AsyncResult.Failure ->
@@ -285,9 +286,7 @@ class ExplorationActivityPresenter @Inject constructor(
             is AsyncResult.Success -> {
               oppiaLogger.d("ExplorationActivity", "Successfully stopped exploration")
               if (isCompletion) {
-                maybeShowSurveyDialog(profileId, topicId)
-              } else {
-                backPressActivitySelector()
+
               }
             }
           }
@@ -312,6 +311,8 @@ class ExplorationActivityPresenter @Inject constructor(
    * current exploration.
    */
   fun backButtonPressed() {
+    // check if survey should be shown
+    maybeShowSurveyDialog(profileId, topicId)
     // If checkpointing is not enabled, show StopExplorationDialogFragment to exit the exploration,
     // this is expected to happen if the exploration is marked as completed.
     if (!isCheckpointingEnabled) {
@@ -510,43 +511,54 @@ class ExplorationActivityPresenter @Inject constructor(
   }
 
   private fun maybeShowSurveyDialog(profileId: ProfileId, topicId: String) {
-    surveyGatingController.maybeShowSurvey(profileId, topicId).toLiveData()
-      .observe(
-        activity,
-        { gatingResult ->
-          when (gatingResult) {
-            is AsyncResult.Pending -> {
-              oppiaLogger.d("ExplorationActivity", "A gating decision is pending")
-            }
-            is AsyncResult.Failure -> {
-              oppiaLogger.e(
-                "ExplorationActivity",
-                "Failed to retrieve gating decision",
-                gatingResult.error
-              )
-              backPressActivitySelector()
-            }
-            is AsyncResult.Success -> {
-              if (gatingResult.value) {
-                val dialogFragment =
-                  SurveyWelcomeDialogFragment.newInstance(
-                    profileId,
-                    topicId,
-                    explorationId,
-                    SURVEY_QUESTIONS
-                  )
-                val transaction = activity.supportFragmentManager.beginTransaction()
-                transaction
-                  .add(dialogFragment, TAG_SURVEY_WELCOME_DIALOG)
-                  .addToBackStack(null)
-                  .commit()
-              } else {
-                backPressActivitySelector()
-              }
-            }
-          }
-        }
+    val dialogFragment =
+      SurveyWelcomeDialogFragment.newInstance(
+        profileId,
+        topicId,
+        explorationId,
+        SURVEY_QUESTIONS
       )
+    val transaction = activity.supportFragmentManager.beginTransaction()
+    transaction
+      .add(dialogFragment, TAG_SURVEY_WELCOME_DIALOG)
+      .addToBackStack(null)
+      .commit()
+//    surveyGatingController.maybeShowSurvey(profileId, topicId).toLiveData()
+//      .observe(
+//        activity
+//      ) { gatingResult ->
+//        when (gatingResult) {
+//          is AsyncResult.Pending -> {
+//            oppiaLogger.d("ExplorationActivity", "A gating decision is pending")
+//          }
+//          is AsyncResult.Failure -> {
+//            oppiaLogger.e(
+//              "ExplorationActivity",
+//              "Failed to retrieve gating decision",
+//              gatingResult.error
+//            )
+//            backPressActivitySelector()
+//          }
+//          is AsyncResult.Success -> {
+//            if (gatingResult.value) {
+//              val dialogFragment =
+//                SurveyWelcomeDialogFragment.newInstance(
+//                  profileId,
+//                  topicId,
+//                  explorationId,
+//                  SURVEY_QUESTIONS
+//                )
+//              val transaction = activity.supportFragmentManager.beginTransaction()
+//              transaction
+//                .add(dialogFragment, TAG_SURVEY_WELCOME_DIALOG)
+//                .addToBackStack(null)
+//                .commit()
+//            } else {
+//              backPressActivitySelector()
+//            }
+//          }
+//        }
+//      }
   }
 
   companion object {
diff --git a/app/src/main/res/drawable/nps_survey_button_background.xml b/app/src/main/res/drawable/nps_survey_button_background.xml
new file mode 100644
index 00000000000..4b3b30c74b2
--- /dev/null
+++ b/app/src/main/res/drawable/nps_survey_button_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="rectangle">
+  <corners android:radius="@dimen/spotlight_done_button_corner_radius" />
+  <solid android:color="@color/component_color_shared_button_active_solid_color" />
+  <stroke
+    android:width="1dp"
+    android:color="@color/component_color_shared_button_active_stroke_color" />
+</shape>
diff --git a/app/src/main/res/drawable/nps_survey_button_inactive_background.xml b/app/src/main/res/drawable/nps_survey_button_inactive_background.xml
new file mode 100644
index 00000000000..483a034333e
--- /dev/null
+++ b/app/src/main/res/drawable/nps_survey_button_inactive_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="rectangle">
+  <corners android:radius="@dimen/state_previous_next_button_radius" />
+  <solid android:color="@color/component_color_shared_button_inactive_solid_color" />
+  <stroke
+    android:width="1dp"
+    android:color="@color/component_color_nps_survey_button_inactive_stroke_color" />
+</shape>
diff --git a/app/src/main/res/layout/survey_free_form_layout.xml b/app/src/main/res/layout/survey_free_form_layout.xml
index 1a1dc5238a2..fb915d5a13c 100644
--- a/app/src/main/res/layout/survey_free_form_layout.xml
+++ b/app/src/main/res/layout/survey_free_form_layout.xml
@@ -32,7 +32,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/survey_navigation_buttons_margin"
-      android:background="@{viewModel.isAnswerAvailable() ? @drawable/state_button_primary_background : @drawable/state_button_inactive_background}"
+      android:background="@{viewModel.isAnswerAvailable() ? @drawable/nps_survey_button_background : @drawable/nps_survey_button_inactive_background}"
       android:clickable="@{viewModel.isAnswerAvailable()}"
       android:enabled="@{viewModel.isAnswerAvailable()}"
       android:onClick="@{(v) ->viewModel.handleSubmitButtonClicked()}"
diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml
index 0becb8a1dd6..6e127e82b3b 100644
--- a/app/src/main/res/values-night/color_palette.xml
+++ b/app/src/main/res/values-night/color_palette.xml
@@ -210,6 +210,7 @@
   <color name="color_palette_survey_previous_button_text_color">@color/color_def_dark_turquoise</color>
   <color name="color_palette_survey_progress_bar_solid_color">@color/color_def_oppia_green</color>
   <color name="color_palette_survey_popup_header_color">@color/color_def_white_f5</color>
+  <color name="color_palette_nps_survey_button_inactive_stroke_color">@color/color_def_black_grey</color>
   <color name="color_palette_survey_popup_background_color">@color/color_def_dark_green</color>
   <color name="color_palette_survey_popup_message_color">@color/color_def_white</color>
   <color name="color_palette_survey_white_button_color">@color/color_def_white_f6</color>
@@ -222,6 +223,6 @@
   <color name="color_palette_edit_text_unselected_color">@color/color_def_grey</color>
   <color name="color_palette_nps_unselected_text_color">@color/color_def_dark_green</color>
   <color name="color_palette_nps_selected_text_color">@color/color_def_white</color>
-  <color name="color_palette_nps_selected_background_color">@color/color_def_dark_green</color>
+  <color name="color_palette_nps_selected_background_color">@color/color_def_oppia_green</color>
   <color name="color_palette_nps_unselected_background_color">@color/color_def_pale_green</color>
 </resources>
diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml
index 751c98a0e3c..50e8f6caa30 100644
--- a/app/src/main/res/values/color_palette.xml
+++ b/app/src/main/res/values/color_palette.xml
@@ -250,6 +250,7 @@
   <color name="color_palette_survey_previous_button_text_color">@color/color_def_oppia_green</color>
   <color name="color_palette_survey_progress_bar_solid_color">@color/color_def_oppia_green</color>
   <color name="color_palette_survey_popup_header_color">@color/color_def_oppia_green</color>
+  <color name="color_palette_nps_survey_button_inactive_stroke_color">@color/color_def_oppia_green</color>
   <color name="color_palette_survey_popup_background_color">@color/color_def_oppia_green</color>
   <color name="color_palette_survey_popup_message_color">@color/color_def_white</color>
   <color name="color_palette_survey_white_button_color">@color/color_def_white_f6</color>
diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml
index b3fd4c17a70..f72584f767f 100644
--- a/app/src/main/res/values/component_colors.xml
+++ b/app/src/main/res/values/component_colors.xml
@@ -282,6 +282,7 @@
   <color name="component_color_survey_shared_button_color">@color/color_palette_survey_shared_button_color</color>
   <color name="component_color_survey_previous_button_text_color">@color/color_palette_survey_previous_button_text_color</color>
   <color name="component_color_survey_progress_bar_solid_color">@color/color_palette_survey_progress_bar_solid_color</color>
+  <color name="component_color_nps_survey_button_inactive_stroke_color">@color/color_palette_nps_survey_button_inactive_stroke_color</color>
   <color name="component_color_survey_popup_header_text_color">@color/color_palette_survey_popup_header_color</color>
   <color name="component_color_survey_popup_message_color">@color/color_palette_survey_popup_message_color</color>
   <color name="component_color_survey_popup_background_color">@color/color_palette_survey_popup_background_color</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3738d2d993b..d9123efc11d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -530,7 +530,7 @@
     <item name="android:background">@drawable/rounded_button_white_background_color</item>
     <item name="android:fontFamily">sans-serif-medium</item>
     <item name="android:minHeight">@dimen/clickable_item_min_height</item>
-    <item name="android:textAllCaps">true</item>
+    <item name="android:textAllCaps">false</item>
     <item name="android:textColor">@color/component_color_begin_survey_button_text_color</item>
     <item name="android:textSize">14sp</item>
   </style>
@@ -544,7 +544,7 @@
     <item name="android:background">@drawable/rounded_button_white_outline_color</item>
     <item name="android:fontFamily">sans-serif-medium</item>
     <item name="android:minHeight">@dimen/clickable_item_min_height</item>
-    <item name="android:textAllCaps">true</item>
+    <item name="android:textAllCaps">false</item>
     <item name="android:textColor">@color/component_color_shared_secondary_4_text_color</item>
     <item name="android:textSize">14sp</item>
   </style>
@@ -557,7 +557,7 @@
     <item name="android:layout_margin">@dimen/survey_navigation_buttons_margin</item>
     <item name="android:fontFamily">sans-serif-medium</item>
     <item name="android:minHeight">@dimen/clickable_item_min_height</item>
-    <item name="android:textAllCaps">true</item>
+    <item name="android:textAllCaps">false</item>
     <item name="android:textColor">@color/component_color_survey_previous_button_text_color</item>
     <item name="android:textSize">14sp</item>
   </style>
@@ -571,7 +571,7 @@
     <item name="android:background">@drawable/state_button_primary_background</item>
     <item name="android:fontFamily">sans-serif-medium</item>
     <item name="android:minHeight">@dimen/clickable_item_min_height</item>
-    <item name="android:textAllCaps">true</item>
+    <item name="android:textAllCaps">false</item>
     <item name="android:textColor">@color/component_color_shared_secondary_4_text_color</item>
     <item name="android:textSize">14sp</item>
   </style>
@@ -584,7 +584,7 @@
     <item name="android:background">@drawable/state_button_primary_background</item>
     <item name="android:fontFamily">sans-serif-medium</item>
     <item name="android:minHeight">@dimen/clickable_item_min_height</item>
-    <item name="android:textAllCaps">true</item>
+    <item name="android:textAllCaps">false</item>
     <item name="android:textColor">@color/component_color_shared_secondary_4_text_color</item>
     <item name="android:textSize">14sp</item>
   </style>
@@ -626,7 +626,7 @@
     <item name="android:layout_margin">@dimen/survey_popup_message_margin</item>
     <item name="android:textSize">@dimen/survey_popup_message_text_size</item>
     <item name="android:fontFamily">sans-serif</item>
-
+    <item name="android:textAllCaps">false</item>
   </style>
 
   <style name="SurveyNpsHintTextStyle">

From f813c8ecd98078c6004334e9c10e951c86bd464a Mon Sep 17 00:00:00 2001
From: MohitGupta121 <guptamm.22@gmail.com>
Date: Mon, 31 Jul 2023 15:30:41 -0600
Subject: [PATCH 5/7] restore minor changes

---
 .../ExplorationActivityPresenter.kt           | 92 ++++++++-----------
 1 file changed, 40 insertions(+), 52 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
index a500f2164b6..5d1d0414196 100644
--- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
@@ -269,7 +269,7 @@ class ExplorationActivityPresenter @Inject constructor(
         profileId, oldestCheckpointExplorationId
       )
     }
-    stopExploration(isCompletion = true)
+    stopExploration(isCompletion = false)
   }
 
   fun stopExploration(isCompletion: Boolean) {
@@ -278,7 +278,6 @@ class ExplorationActivityPresenter @Inject constructor(
       .observe(
         activity,
         {
-          maybeShowSurveyDialog(profileId, topicId)
           when (it) {
             is AsyncResult.Pending -> oppiaLogger.d("ExplorationActivity", "Stopping exploration")
             is AsyncResult.Failure ->
@@ -286,7 +285,9 @@ class ExplorationActivityPresenter @Inject constructor(
             is AsyncResult.Success -> {
               oppiaLogger.d("ExplorationActivity", "Successfully stopped exploration")
               if (isCompletion) {
-
+                maybeShowSurveyDialog(profileId, topicId)
+              } else {
+                backPressActivitySelector()
               }
             }
           }
@@ -311,8 +312,6 @@ class ExplorationActivityPresenter @Inject constructor(
    * current exploration.
    */
   fun backButtonPressed() {
-    // check if survey should be shown
-    maybeShowSurveyDialog(profileId, topicId)
     // If checkpointing is not enabled, show StopExplorationDialogFragment to exit the exploration,
     // this is expected to happen if the exploration is marked as completed.
     if (!isCheckpointingEnabled) {
@@ -511,54 +510,43 @@ class ExplorationActivityPresenter @Inject constructor(
   }
 
   private fun maybeShowSurveyDialog(profileId: ProfileId, topicId: String) {
-    val dialogFragment =
-      SurveyWelcomeDialogFragment.newInstance(
-        profileId,
-        topicId,
-        explorationId,
-        SURVEY_QUESTIONS
+    surveyGatingController.maybeShowSurvey(profileId, topicId).toLiveData()
+      .observe(
+        activity,
+        { gatingResult ->
+          when (gatingResult) {
+            is AsyncResult.Pending -> {
+              oppiaLogger.d("ExplorationActivity", "A gating decision is pending")
+            }
+            is AsyncResult.Failure -> {
+              oppiaLogger.e(
+                "ExplorationActivity",
+                "Failed to retrieve gating decision",
+                gatingResult.error
+              )
+              backPressActivitySelector()
+            }
+            is AsyncResult.Success -> {
+              if (gatingResult.value) {
+                val dialogFragment =
+                  SurveyWelcomeDialogFragment.newInstance(
+                    profileId,
+                    topicId,
+                    explorationId,
+                    SURVEY_QUESTIONS
+                  )
+                val transaction = activity.supportFragmentManager.beginTransaction()
+                transaction
+                  .add(dialogFragment, TAG_SURVEY_WELCOME_DIALOG)
+                  .addToBackStack(null)
+                  .commit()
+              } else {
+                backPressActivitySelector()
+              }
+            }
+          }
+        }
       )
-    val transaction = activity.supportFragmentManager.beginTransaction()
-    transaction
-      .add(dialogFragment, TAG_SURVEY_WELCOME_DIALOG)
-      .addToBackStack(null)
-      .commit()
-//    surveyGatingController.maybeShowSurvey(profileId, topicId).toLiveData()
-//      .observe(
-//        activity
-//      ) { gatingResult ->
-//        when (gatingResult) {
-//          is AsyncResult.Pending -> {
-//            oppiaLogger.d("ExplorationActivity", "A gating decision is pending")
-//          }
-//          is AsyncResult.Failure -> {
-//            oppiaLogger.e(
-//              "ExplorationActivity",
-//              "Failed to retrieve gating decision",
-//              gatingResult.error
-//            )
-//            backPressActivitySelector()
-//          }
-//          is AsyncResult.Success -> {
-//            if (gatingResult.value) {
-//              val dialogFragment =
-//                SurveyWelcomeDialogFragment.newInstance(
-//                  profileId,
-//                  topicId,
-//                  explorationId,
-//                  SURVEY_QUESTIONS
-//                )
-//              val transaction = activity.supportFragmentManager.beginTransaction()
-//              transaction
-//                .add(dialogFragment, TAG_SURVEY_WELCOME_DIALOG)
-//                .addToBackStack(null)
-//                .commit()
-//            } else {
-//              backPressActivitySelector()
-//            }
-//          }
-//        }
-//      }
   }
 
   companion object {

From d92c8c9f06377402044a567367fdfc67733649c1 Mon Sep 17 00:00:00 2001
From: MohitGupta121 <guptamm.22@gmail.com>
Date: Mon, 31 Jul 2023 16:44:26 -0600
Subject: [PATCH 6/7] make separate dimension for survey

---
 app/src/main/res/drawable/nps_survey_button_background.xml      | 2 +-
 .../main/res/drawable/nps_survey_button_inactive_background.xml | 2 +-
 app/src/main/res/values/dimens.xml                              | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/drawable/nps_survey_button_background.xml b/app/src/main/res/drawable/nps_survey_button_background.xml
index 4b3b30c74b2..a5590eebf92 100644
--- a/app/src/main/res/drawable/nps_survey_button_background.xml
+++ b/app/src/main/res/drawable/nps_survey_button_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
-  <corners android:radius="@dimen/spotlight_done_button_corner_radius" />
+  <corners android:radius="@dimen/survey_button_corner_radius" />
   <solid android:color="@color/component_color_shared_button_active_solid_color" />
   <stroke
     android:width="1dp"
diff --git a/app/src/main/res/drawable/nps_survey_button_inactive_background.xml b/app/src/main/res/drawable/nps_survey_button_inactive_background.xml
index 483a034333e..c6d563ecc99 100644
--- a/app/src/main/res/drawable/nps_survey_button_inactive_background.xml
+++ b/app/src/main/res/drawable/nps_survey_button_inactive_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
-  <corners android:radius="@dimen/state_previous_next_button_radius" />
+  <corners android:radius="@dimen/survey_button_corner_radius" />
   <solid android:color="@color/component_color_shared_button_inactive_solid_color" />
   <stroke
     android:width="1dp"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f3a61db0ee7..f14ef3f518e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -785,4 +785,5 @@
   <dimen name="survey_popup_button_margin">32dp</dimen>
   <dimen name="survey_nps_options_margin">8dp</dimen>
   <dimen name="survey_nps_hint_text_margin">16dp</dimen>
+  <dimen name="survey_button_corner_radius">4dp</dimen>
 </resources>

From 2b7919e14c90d97b0fa1c4c58bcadc1b31a5e48d Mon Sep 17 00:00:00 2001
From: MohitGupta121 <guptamm.22@gmail.com>
Date: Tue, 1 Aug 2023 09:54:48 -0600
Subject: [PATCH 7/7] fix night color of Previous button

---
 app/src/main/res/values-night/color_palette.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml
index 6e127e82b3b..7bb64f94cb7 100644
--- a/app/src/main/res/values-night/color_palette.xml
+++ b/app/src/main/res/values-night/color_palette.xml
@@ -207,7 +207,7 @@
   <!-- SURVEY -->
   <color name="color_palette_survey_background_color">@color/color_def_oppia_light_black</color>
   <color name="color_palette_survey_shared_button_color">@color/color_def_white_f6</color>
-  <color name="color_palette_survey_previous_button_text_color">@color/color_def_dark_turquoise</color>
+  <color name="color_palette_survey_previous_button_text_color">@color/color_def_oppia_turquoise</color>
   <color name="color_palette_survey_progress_bar_solid_color">@color/color_def_oppia_green</color>
   <color name="color_palette_survey_popup_header_color">@color/color_def_white_f5</color>
   <color name="color_palette_nps_survey_button_inactive_stroke_color">@color/color_def_black_grey</color>