Fixes oppia#3564 Merge profile progress header xml (oppia#3885)

* merged landscape and portrait tab layout xml * removed extra blank lines * changed location of profile_progress_header.xml from layout-sw600dp-port to layout-sw600dp * added spaces before and after text and added comment for dimens.xml file * refractor textView to text_view * Resolving failed build
kritigupta45 · Oct 14, 2021 · de345f9 · de345f9
1 parent 15669dc
commit de345f9
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 191 deletions.
diff --git a/app/src/main/res/layout-sw600dp-port/profile_progress_header.xml b/app/src/main/res/layout-sw600dp-port/profile_progress_header.xml
diff --git a/...-sw600dp-land/profile_progress_header.xml → ...ayout-sw600dp/profile_progress_header.xml b/...-sw600dp-land/profile_progress_header.xml → ...ayout-sw600dp/profile_progress_header.xml
@@ -20,7 +20,7 @@
  android:id="@+id/profile_edit_image"
  android:layout_width="160dp"
  android:layout_height="160dp"
- android:layout_marginStart="202dp"
+ android:layout_marginStart="@dimen/profile_edit_image_layout_margin_start"
  android:clickable="true"
  android:contentDescription="@string/current_profile_picture_content_description"
  android:focusable="true"
@@ -48,7 +48,7 @@
  android:layout_height="wrap_content"
  android:layout_marginStart="44dp"
  android:layout_marginTop="12dp"
- android:layout_marginEnd="202dp"
+ android:layout_marginEnd="@dimen/profile_name_text_view_layout_margin_end"
  android:fontFamily="sans-serif-medium"
  android:text="@{viewModel.profile.name}"
  android:textAlignment="viewStart"
@@ -154,7 +154,7 @@
  android:id="@+id/recently_played_stories_text_view"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- android:layout_marginStart="32dp"
+ android:layout_marginStart="@dimen/recently_played_stories_text_view_layout_margin_start"
  android:layout_marginTop="76dp"
  android:fontFamily="sans-serif-medium"
  android:gravity="center_vertical"
@@ -170,7 +170,7 @@
  android:id="@+id/view_all_text_view"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- android:layout_marginEnd="32dp"
+ android:layout_marginEnd="@dimen/view_all_text_view_margin_end"
  android:fontFamily="sans-serif-medium"
  android:gravity="center_vertical"
  android:minHeight="48dp"

diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -348,6 +348,12 @@
  <!-- Topic Lessons Fragment -->
  <dimen name="topic_lessons_fragment_layout_padding_bottom">100dp</dimen>
 
+ <!-- Profile Progress Header -->
+ <dimen name="profile_edit_image_layout_margin_start">202dp</dimen>
+ <dimen name="profile_name_text_view_layout_margin_end">202dp</dimen>
+ <dimen name="recently_played_stories_text_view_layout_margin_start">32dp</dimen>
+ <dimen name="view_all_text_view_margin_end">32dp</dimen>
+
  <!-- Ongoing Topic List Fragment -->
  <dimen name="ongoing_topic_list_fragment_padding_start">64dp</dimen>
  <dimen name="ongoing_topic_list_fragment_padding_top">24dp</dimen>

diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -350,6 +350,12 @@
  <!-- Topic Lessons Fragment -->
  <dimen name="topic_lessons_fragment_layout_padding_bottom">100dp</dimen>
 
+ <!-- Profile Progress Header -->
+ <dimen name="profile_edit_image_layout_margin_start">42dp</dimen>
+ <dimen name="profile_name_text_view_layout_margin_end">42dp</dimen>
+ <dimen name="recently_played_stories_text_view_layout_margin_start">24dp</dimen>
+ <dimen name="view_all_text_view_margin_end">24dp</dimen>
+
  <!-- Ongoing Topic List Fragment -->
  <dimen name="ongoing_topic_list_fragment_padding_start">96dp</dimen>
  <dimen name="ongoing_topic_list_fragment_padding_top">12dp</dimen>

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -521,6 +521,13 @@
  <dimen name="story_header_view_layout_margin_start">32dp</dimen>
  <dimen name="story_header_view_layout_margin_end">32dp</dimen>
 
+ <!-- These values are getting used only in tablet mode and therefore mentioned as 0dp here -->
+ <!-- Profile Progress Header -->
+ <dimen name="profile_edit_image_layout_margin_start">0dp</dimen>
+ <dimen name="profile_name_text_view_layout_margin_end">0dp</dimen>
+ <dimen name="recently_played_stories_text_view_layout_margin_start">0dp</dimen>
+ <dimen name="view_all_text_view_margin_end">0dp</dimen>
+
  <!-- Ongoing Topic List Fragment -->
  <dimen name="ongoing_topic_list_fragment_padding_start">20dp</dimen>
  <dimen name="ongoing_topic_list_fragment_padding_top">20dp</dimen>