From 138180f0b3199879ab77bb86cf1744b33227088d Mon Sep 17 00:00:00 2001
From: the_mr17 <saptakmanna100@gmail.com>
Date: Tue, 3 Oct 2023 19:42:28 +0530
Subject: [PATCH 1/3] Adds portrait tablet ui

---
 .../resume_lesson_fragment.xml                | 126 ++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml

diff --git a/app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml b/app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml
new file mode 100644
index 00000000000..637a2743317
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml
@@ -0,0 +1,126 @@
+<?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">
+
+  <data>
+
+    <import type="android.view.View" />
+
+    <variable
+      name="viewModel"
+      type="org.oppia.android.app.resumelesson.ResumeLessonViewModel" />
+  </data>
+
+  <ScrollView
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/component_color_shared_screen_primary_background_color"
+    android:overScrollMode="never"
+    android:scrollbars="none">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:paddingBottom="24dp">
+
+      <org.oppia.android.app.customview.LessonThumbnailImageView
+        android:id="@+id/resume_lesson_chapter_thumbnail_image_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:adjustViewBounds="true"
+        app:entityId="@{viewModel.chapterSummary.explorationId}"
+        app:entityType="@{viewModel.entityType}"
+        app:layout_constraintDimensionRatio="16:9"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:lessonThumbnail="@{viewModel.chapterSummary.chapterThumbnail}" />
+
+      <TextView
+        android:id="@+id/resume_lesson_chapter_title_text_view"
+        style="@style/TextViewStart"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="70dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="70dp"
+        android:layout_marginBottom="16dp"
+        android:fontFamily="sans-serif"
+        android:text="@{viewModel.chapterTitle}"
+        android:textColor="@color/component_color_shared_primary_text_color"
+        android:textDirection="locale"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/resume_lesson_chapter_thumbnail_image_view" />
+
+      <TextView
+        android:id="@+id/resume_lesson_chapter_description_text_view"
+        style="@style/Body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="70dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="70dp"
+        android:ellipsize="end"
+        android:textColor="@color/component_color_shared_secondary_1_text_color"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/resume_lesson_chapter_title_text_view" />
+
+      <com.google.android.flexbox.FlexboxLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="70dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="70dp"
+        app:alignContent="flex_start"
+        app:alignItems="center"
+        app:flexDirection="row"
+        app:flexWrap="wrap"
+        app:justifyContent="space_evenly"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/resume_lesson_chapter_description_text_view">
+
+        <com.google.android.material.button.MaterialButton
+          android:id="@+id/resume_lesson_start_over_button"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_margin="8dp"
+          android:background="@drawable/secondary_button_background"
+          android:fontFamily="sans-serif-medium"
+          android:gravity="center"
+          android:minWidth="144dp"
+          android:minHeight="@dimen/clickable_item_min_height"
+          android:text="@string/start_over_lesson_button"
+          android:textAllCaps="false"
+          android:textColor="@color/component_color_shared_secondary_button_background_trim_color"
+          android:textSize="14sp"
+          app:backgroundTint="@null"
+          app:icon="@drawable/ic_start_over_24dp"
+          app:iconGravity="textStart"
+          app:iconTint="@color/component_color_shared_secondary_button_background_trim_color" />
+
+        <com.google.android.material.button.MaterialButton
+          android:id="@+id/resume_lesson_continue_button"
+          android:layout_width="wrap_content"
+          android:layout_height="match_parent"
+          android:background="@drawable/state_button_primary_background"
+          android:fontFamily="sans-serif-medium"
+          android:gravity="center"
+          android:minWidth="144dp"
+          android:minHeight="@dimen/clickable_item_min_height"
+          android:text="@string/resume_lesson_button"
+          android:textAllCaps="false"
+          android:textColor="@color/component_color_shared_secondary_4_text_color"
+          android:textSize="14sp"
+          app:backgroundTint="@null"
+          app:icon="@drawable/ic_arrow_right_alt_24dp"
+          app:iconGravity="textEnd" />
+      </com.google.android.flexbox.FlexboxLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+  </ScrollView>
+</layout>

From 47ffe31baaac3ed2df5e4f0619bf281a9e6c9846 Mon Sep 17 00:00:00 2001
From: "Mr. 17" <saptakmanna100@gmail.com>
Date: Fri, 6 Oct 2023 22:20:50 +0530
Subject: [PATCH 2/3] Adds dimens

---
 .../resume_lesson_fragment.xml                | 20 +++++++++----------
 .../main/res/values-sw600dp-port/dimens.xml   | 12 +++++++++++
 app/src/main/res/values/dimens.xml            | 12 +++++++++++
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml b/app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml
index 637a2743317..72617a5d24d 100644
--- a/app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml
@@ -41,10 +41,10 @@
         style="@style/TextViewStart"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="70dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="70dp"
-        android:layout_marginBottom="16dp"
+        android:layout_marginStart="@dimen/resume_lesson_chapter_title_text_margin_start"
+        android:layout_marginTop="@dimen/resume_lesson_chapter_title_text_margin_top"
+        android:layout_marginEnd="@dimen/resume_lesson_chapter_title_text_margin_end"
+        android:layout_marginBottom="@dimen/resume_lesson_chapter_title_text_margin_bottom"
         android:fontFamily="sans-serif"
         android:text="@{viewModel.chapterTitle}"
         android:textColor="@color/component_color_shared_primary_text_color"
@@ -60,9 +60,9 @@
         style="@style/Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="70dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="70dp"
+        android:layout_marginStart="@dimen/resume_lesson_chapter_description_text_margin_start"
+        android:layout_marginTop="@dimen/resume_lesson_chapter_description_text_margin_top"
+        android:layout_marginEnd="@dimen/resume_lesson_chapter_description_text_margin_end"
         android:ellipsize="end"
         android:textColor="@color/component_color_shared_secondary_1_text_color"
         app:layout_constraintEnd_toEndOf="parent"
@@ -72,9 +72,9 @@
       <com.google.android.flexbox.FlexboxLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="70dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="70dp"
+        android:layout_marginStart="@dimen/resume_lesson_chapter_flexbox_margin_start"
+        android:layout_marginTop="@dimen/resume_lesson_chapter_flexbox_margin_top"
+        android:layout_marginEnd="@dimen/resume_lesson_chapter_flexbox_margin_end"
         app:alignContent="flex_start"
         app:alignItems="center"
         app:flexDirection="row"
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
index e74fb00df51..1a222ad4adc 100644
--- a/app/src/main/res/values-sw600dp-port/dimens.xml
+++ b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -511,4 +511,16 @@
   <dimen name="profile_chooser_margin_top_profile_not_added">124dp</dimen>
   <dimen name="profile_chooser_administrator_controls_margin_bottom">32dp</dimen>
   <dimen name="profile_chooser_setting_icon_margin_end">64dp</dimen>
+  
+  <!--  ResumeLessonFragment-->
+  <dimen name="resume_lesson_chapter_title_text_margin_start">72dp</dimen>
+  <dimen name="resume_lesson_chapter_title_text_margin_end">72dp</dimen>
+  <dimen name="resume_lesson_chapter_title_text_margin_top">32dp</dimen>
+  <dimen name="resume_lesson_chapter_title_text_margin_bottom">16dp</dimen>
+  <dimen name="resume_lesson_chapter_description_text_margin_start">72dp</dimen>
+  <dimen name="resume_lesson_chapter_description_text_margin_end">72dp</dimen>
+  <dimen name="resume_lesson_chapter_description_text_margin_top">16dp</dimen>
+  <dimen name="resume_lesson_chapter_flexbox_margin_start">72dp</dimen>
+  <dimen name="resume_lesson_chapter_flexbox_margin_end">72dp</dimen>
+  <dimen name="resume_lesson_chapter_flexbox_margin_top">32dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f14ef3f518e..d50d8cd2455 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -786,4 +786,16 @@
   <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>
+
+  <!--  ResumeLessonFragment-->
+  <dimen name="resume_lesson_chapter_title_text_margin_start">32dp</dimen>
+  <dimen name="resume_lesson_chapter_title_text_margin_end">32dp</dimen>
+  <dimen name="resume_lesson_chapter_title_text_margin_top">32dp</dimen>
+  <dimen name="resume_lesson_chapter_title_text_margin_bottom">16dp</dimen>
+  <dimen name="resume_lesson_chapter_description_text_margin_start">32dp</dimen>
+  <dimen name="resume_lesson_chapter_description_text_margin_end">32dp</dimen>
+  <dimen name="resume_lesson_chapter_description_text_margin_top">16dp</dimen>
+  <dimen name="resume_lesson_chapter_flexbox_margin_start">28dp</dimen>
+  <dimen name="resume_lesson_chapter_flexbox_margin_end">28dp</dimen>
+  <dimen name="resume_lesson_chapter_flexbox_margin_top">32dp</dimen>
 </resources>

From 742d55c5c79671ae3b657ea0237c3ed8a9ea4780 Mon Sep 17 00:00:00 2001
From: "Mr. 17" <saptakmanna100@gmail.com>
Date: Fri, 6 Oct 2023 22:47:01 +0530
Subject: [PATCH 3/3] Adds missing dimen

---
 app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml | 2 +-
 app/src/main/res/values-sw600dp-port/dimens.xml                 | 1 +
 app/src/main/res/values/dimens.xml                              | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml b/app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml
index 72617a5d24d..44454b975c0 100644
--- a/app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml
@@ -89,7 +89,7 @@
           android:id="@+id/resume_lesson_start_over_button"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:layout_margin="8dp"
+          android:layout_margin="@dimen/resume_lesson_start_over_button_margin"
           android:background="@drawable/secondary_button_background"
           android:fontFamily="sans-serif-medium"
           android:gravity="center"
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
index 1a222ad4adc..681f7e8b90e 100644
--- a/app/src/main/res/values-sw600dp-port/dimens.xml
+++ b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -523,4 +523,5 @@
   <dimen name="resume_lesson_chapter_flexbox_margin_start">72dp</dimen>
   <dimen name="resume_lesson_chapter_flexbox_margin_end">72dp</dimen>
   <dimen name="resume_lesson_chapter_flexbox_margin_top">32dp</dimen>
+  <dimen name="resume_lesson_start_over_button_margin">8dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index d50d8cd2455..b45f8c6d305 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -798,4 +798,5 @@
   <dimen name="resume_lesson_chapter_flexbox_margin_start">28dp</dimen>
   <dimen name="resume_lesson_chapter_flexbox_margin_end">28dp</dimen>
   <dimen name="resume_lesson_chapter_flexbox_margin_top">32dp</dimen>
+  <dimen name="resume_lesson_start_over_button_margin">8dp</dimen>
 </resources>