From da7eccd78c509427e9c0faf230f09cf6bbe35785 Mon Sep 17 00:00:00 2001
From: Swarnim Pratap Singh <swarnim132@gmail.com>
Date: Wed, 23 Jun 2021 18:39:58 +0530
Subject: [PATCH] Fix ##3359 Convert welcome.xml into single layout file

---
 app/src/main/res/layout-land/welcome.xml      | 60 -------------------
 .../main/res/layout-sw600dp-land/welcome.xml  | 60 -------------------
 .../main/res/layout-sw600dp-port/welcome.xml  | 60 -------------------
 app/src/main/res/layout/welcome.xml           |  6 +-
 app/src/main/res/values-land/dimens.xml       |  1 +
 .../main/res/values-sw600dp-land/dimens.xml   |  1 +
 .../main/res/values-sw600dp-port/dimens.xml   |  1 +
 app/src/main/res/values/dimens.xml            |  1 +
 8 files changed, 7 insertions(+), 183 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/welcome.xml
 delete mode 100644 app/src/main/res/layout-sw600dp-land/welcome.xml
 delete mode 100644 app/src/main/res/layout-sw600dp-port/welcome.xml

diff --git a/app/src/main/res/layout-land/welcome.xml b/app/src/main/res/layout-land/welcome.xml
deleted file mode 100644
index cddfcc8ebc1..00000000000
--- a/app/src/main/res/layout-land/welcome.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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>
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.home.WelcomeViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingStart="72dp"
-    android:paddingEnd="72dp">
-
-    <com.google.android.flexbox.FlexboxLayout
-      android:id="@+id/welcome_message_container"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      app:alignContent="flex_start"
-      app:alignItems="flex_start"
-      app:flexDirection="row"
-      app:flexWrap="wrap"
-      app:justifyContent="flex_start"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent">
-
-      <TextView
-        android:id="@+id/welcome_text_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:fontFamily="sans-serif"
-        android:text="@{viewModel.greeting}"
-        android:textColor="@color/oppiaPrimaryText"
-        android:textSize="24sp" />
-
-      <TextView
-        android:id="@+id/profile_name_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fontFamily="sans-serif"
-        android:text="@{String.format(@string/welcome_profile_name, viewModel.profileName)}"
-        android:textColor="@color/oppiaPrimaryText"
-        android:textSize="24sp" />
-    </com.google.android.flexbox.FlexboxLayout>
-
-    <View
-      android:layout_width="0dp"
-      android:layout_height="6dp"
-      android:layout_marginTop="4dp"
-      android:background="@color/oppiaLightBrown"
-      app:layout_constraintEnd_toEndOf="@id/welcome_message_container"
-      app:layout_constraintHorizontal_bias="0.0"
-      app:layout_constraintStart_toStartOf="@+id/welcome_message_container"
-      app:layout_constraintTop_toBottomOf="@+id/welcome_message_container" />
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp-land/welcome.xml b/app/src/main/res/layout-sw600dp-land/welcome.xml
deleted file mode 100644
index b476c27c230..00000000000
--- a/app/src/main/res/layout-sw600dp-land/welcome.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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>
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.home.WelcomeViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingStart="@dimen/home_tablet_land_outer_margin"
-    android:paddingEnd="@dimen/home_tablet_land_outer_margin">
-
-    <com.google.android.flexbox.FlexboxLayout
-      android:id="@+id/welcome_message_container"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      app:alignContent="flex_start"
-      app:alignItems="flex_start"
-      app:flexDirection="row"
-      app:flexWrap="wrap"
-      app:justifyContent="flex_start"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent">
-
-      <TextView
-        android:id="@+id/welcome_text_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:fontFamily="sans-serif"
-        android:text="@{viewModel.greeting}"
-        android:textColor="@color/oppiaPrimaryText"
-        android:textSize="24sp" />
-
-      <TextView
-        android:id="@+id/profile_name_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fontFamily="sans-serif"
-        android:text="@{String.format(@string/welcome_profile_name, viewModel.profileName)}"
-        android:textColor="@color/oppiaPrimaryText"
-        android:textSize="24sp" />
-    </com.google.android.flexbox.FlexboxLayout>
-
-    <View
-      android:layout_width="0dp"
-      android:layout_height="6dp"
-      android:layout_marginTop="4dp"
-      android:background="@color/oppiaLightBrown"
-      app:layout_constraintEnd_toEndOf="@id/welcome_message_container"
-      app:layout_constraintHorizontal_bias="0.0"
-      app:layout_constraintStart_toStartOf="@+id/welcome_message_container"
-      app:layout_constraintTop_toBottomOf="@+id/welcome_message_container" />
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp-port/welcome.xml b/app/src/main/res/layout-sw600dp-port/welcome.xml
deleted file mode 100644
index 01b4cd488bf..00000000000
--- a/app/src/main/res/layout-sw600dp-port/welcome.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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>
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.home.WelcomeViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingStart="@dimen/home_tablet_port_outer_margin"
-    android:paddingEnd="@dimen/home_tablet_port_outer_margin">
-
-    <com.google.android.flexbox.FlexboxLayout
-      android:id="@+id/welcome_message_container"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      app:alignContent="flex_start"
-      app:alignItems="flex_start"
-      app:flexDirection="row"
-      app:flexWrap="wrap"
-      app:justifyContent="flex_start"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent">
-
-      <TextView
-        android:id="@+id/welcome_text_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:fontFamily="sans-serif"
-        android:text="@{viewModel.greeting}"
-        android:textColor="@color/oppiaPrimaryText"
-        android:textSize="24sp" />
-
-      <TextView
-        android:id="@+id/profile_name_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fontFamily="sans-serif"
-        android:text="@{String.format(@string/welcome_profile_name, viewModel.profileName)}"
-        android:textColor="@color/oppiaPrimaryText"
-        android:textSize="24sp" />
-    </com.google.android.flexbox.FlexboxLayout>
-
-    <View
-      android:layout_width="0dp"
-      android:layout_height="6dp"
-      android:layout_marginTop="4dp"
-      android:background="@color/oppiaBrownDark"
-      app:layout_constraintEnd_toEndOf="@id/welcome_message_container"
-      app:layout_constraintHorizontal_bias="0.0"
-      app:layout_constraintStart_toStartOf="@+id/welcome_message_container"
-      app:layout_constraintTop_toBottomOf="@+id/welcome_message_container" />
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout/welcome.xml b/app/src/main/res/layout/welcome.xml
index d733568e279..17268adf0b7 100644
--- a/app/src/main/res/layout/welcome.xml
+++ b/app/src/main/res/layout/welcome.xml
@@ -12,8 +12,8 @@
   <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="28dp"
-    android:paddingEnd="28dp">
+    android:paddingStart="@dimen/home_outer_margin"
+    android:paddingEnd="@dimen/home_outer_margin">
 
     <com.google.android.flexbox.FlexboxLayout
       android:id="@+id/welcome_message_container"
@@ -31,7 +31,7 @@
         android:id="@+id/welcome_text_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="4dp"
+        android:layout_marginEnd="@dimen/home_welcome_text_view_margin_end"
         android:fontFamily="sans-serif"
         android:text="@{viewModel.greeting}"
         android:textColor="@color/oppiaPrimaryText"
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index bab9682c143..c0f731f7a4d 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -3,6 +3,7 @@
   <dimen name="home_padding_end">64dp</dimen>
   <dimen name="home_padding_start">64dp</dimen>
   <dimen name="home_outer_margin">72dp</dimen>
+  <dimen name="home_welcome_text_view_margin_end">8dp</dimen>
   <dimen name="home_inner_margin">36dp</dimen>
   <dimen name="recently_played_margin_max">72dp</dimen>
   <dimen name="recently_played_margin_min">36dp</dimen>
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
index af06f029e61..e059262a4ca 100644
--- a/app/src/main/res/values-sw600dp-land/dimens.xml
+++ b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -3,6 +3,7 @@
   <dimen name="home_padding_end">64dp</dimen>
   <dimen name="home_padding_start">96dp</dimen>
   <dimen name="home_outer_margin">96dp</dimen>
+  <dimen name="home_welcome_text_view_margin_end">8dp</dimen>
   <dimen name="home_inner_margin">64dp</dimen>
   <dimen name="recently_played_margin_max">96dp</dimen>
   <dimen name="recently_played_margin_min">64dp</dimen>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
index dc00c23b3ad..887939fcc38 100644
--- a/app/src/main/res/values-sw600dp-port/dimens.xml
+++ b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -3,6 +3,7 @@
   <dimen name="home_padding_end">96dp</dimen>
   <dimen name="home_padding_start">120dp</dimen>
   <dimen name="home_outer_margin">120dp</dimen>
+  <dimen name="home_welcome_text_view_margin_end">8dp</dimen>
   <dimen name="home_inner_margin">60dp</dimen>
   <dimen name="recently_played_margin_max">120dp</dimen>
   <dimen name="recently_played_margin_min">60dp</dimen>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 56012fdbc03..a610736d876 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -66,6 +66,7 @@
   <dimen name="home_padding_end">20dp</dimen>
   <dimen name="home_padding_start">20dp</dimen>
   <dimen name="home_outer_margin">28dp</dimen>
+  <dimen name="home_welcome_text_view_margin_end">4dp</dimen>
   <dimen name="home_inner_margin">8dp</dimen>
   <dimen name="home_tablet_land_outer_margin">96dp</dimen>
   <dimen name="home_tablet_port_outer_margin">120dp</dimen>