Fix #3359: Convert welcome.xml into single layout file pull request f…

…or issue (#3368)

* Fix ##3359 Convert welcome.xml into single layout file

* Created new dimens value for home welcome outer padding

* reverting back to previous commits in .idea/misc.xml .idea/runConfigurations.xml build.gradle

* changing files .idea/misc.xml .idea/runConfigurations.xml build.gradle to as per develop branch

* Resolving some commit issues in .idea/misc.xml .idea/runConfigurations.xml build.gradle

* Revert back to prevoius changes in .idea/misc.xml

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_welcome_outer_padding"
+    android:paddingEnd="@dimen/home_welcome_outer_padding">
 
     <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"

app/src/main/res/values-land/dimens.xml

@@ -3,6 +3,8 @@
   <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_outer_padding">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>

app/src/main/res/values-sw600dp-land/dimens.xml

@@ -3,6 +3,8 @@
   <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_outer_padding">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>

app/src/main/res/values-sw600dp-port/dimens.xml

@@ -3,6 +3,8 @@
   <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_outer_padding">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>

app/src/main/res/values/dimens.xml

@@ -66,6 +66,8 @@
   <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_outer_padding">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>