Fix oppia#3573: Merge section_title.xml into single xml (oppia#3977)

* contents under .idea (to be reverted) * added dimen resources for all configurations * deleted extra xml files * Revert "contents under .idea " reverts changes made under .idea folder This reverts commit 6357646 * changes under .idea folder * Revert "changes under .idea folder" This reverts commit 3aa516e * changes under .idea folder * Revert "changes under .idea folder" This reverts commit a7a2ddb * corrected variable name camel_case format and remove extra lines * add one extra line to maintain formatting * remove unused dimen resources * to be reverted: files under .idea folder * to be reverted: files under .idea folder * Revert files under .idea folder * Revert files under .idea folder
kritigupta45 · Nov 15, 2021 · e28e285 · e28e285
1 parent 7465b0b
commit e28e285
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 120 deletions.
diff --git a/app/src/main/res/layout-land/section_title.xml b/app/src/main/res/layout-land/section_title.xml
diff --git a/app/src/main/res/layout-sw600dp-land/section_title.xml b/app/src/main/res/layout-sw600dp-land/section_title.xml
diff --git a/app/src/main/res/layout-sw600dp-port/section_title.xml b/app/src/main/res/layout-sw600dp-port/section_title.xml
diff --git a/app/src/main/res/layout/section_title.xml b/app/src/main/res/layout/section_title.xml
@@ -19,17 +19,17 @@
  android:id="@+id/divider_view"
  android:layout_width="match_parent"
  android:layout_height="1dp"
- android:layout_marginTop="32dp"
+ android:layout_marginTop="@dimen/section_title_divider_view_layout_margin_top"
  android:background="@color/divider"
  android:visibility="@{viewModel.isDividerVisible? View.VISIBLE : View.GONE}" />
 
  <TextView
  android:id="@+id/section_title_text_view"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- android:layout_marginStart="28dp"
- android:layout_marginTop="28dp"
- android:layout_marginEnd="32dp"
+ android:layout_marginStart="@dimen/section_title_text_view_layout_margin_start"
+ android:layout_marginTop="@dimen/section_title_text_view_layout_margin_top"
+ android:layout_marginEnd="@dimen/section_title_text_view_layout_margin_end"
  android:fontFamily="sans-serif-medium"
  android:text="@{viewModel.sectionTitleText}"
  android:textColor="@color/oppiaPrimaryText"

diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
@@ -384,4 +384,10 @@
  <dimen name="profile_rename_activity_profile_rename_input_margin_end">168dp</dimen>
  <dimen name="profile_rename_activity_profile_rename_save_button_margin_end">168dp</dimen>
 
+ <!-- SectionTitleFragment -->
+ <dimen name="section_title_divider_view_layout_margin_top">28dp</dimen>
+ <dimen name="section_title_text_view_layout_margin_start">72dp</dimen>
+ <dimen name="section_title_text_view_layout_margin_top">28dp</dimen>
+ <dimen name="section_title_text_view_layout_margin_end">72dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -390,4 +390,10 @@
  <dimen name="solution_summary_margin_bottom_linear_layout">32dp</dimen>
  <dimen name="solution_summary_margin_top_solution_summary_label">16dp</dimen>
 
+ <!-- SectionTitleFragment -->
+ <dimen name="section_title_divider_view_layout_margin_top">36dp</dimen>
+ <dimen name="section_title_text_view_layout_margin_start">96dp</dimen>
+ <dimen name="section_title_text_view_layout_margin_top">32dp</dimen>
+ <dimen name="section_title_text_view_layout_margin_end">96dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -392,4 +392,10 @@
  <dimen name="solution_summary_margin_bottom_linear_layout">32dp</dimen>
  <dimen name="solution_summary_margin_top_solution_summary_label">16dp</dimen>
 
+ <!-- SectionTitleFragment -->
+ <dimen name="section_title_divider_view_layout_margin_top">48dp</dimen>
+ <dimen name="section_title_text_view_layout_margin_start">120dp</dimen>
+ <dimen name="section_title_text_view_layout_margin_top">32dp</dimen>
+ <dimen name="section_title_text_view_layout_margin_end">120dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -71,8 +71,6 @@
  <dimen name="home_tablet_port_outer_margin">120dp</dimen>
  <dimen name="recently_played_margin_max">28dp</dimen>
  <dimen name="recently_played_margin_min">8dp</dimen>
- <dimen name="recently_played_tablet_land_outer_margin">96dp</dimen>
- <dimen name="recently_played_tablet_port_outer_margin">120dp</dimen>
  <dimen name="coming_soon_padding_end">16dp</dimen>
  <dimen name="coming_soon_padding_start">12dp</dimen>
 
@@ -584,4 +582,10 @@
  <dimen name="profile_rename_activity_profile_rename_input_margin_end">28dp</dimen>
  <dimen name="profile_rename_activity_profile_rename_save_button_margin_end">28dp</dimen>
 
+ <!-- SectionTitleFragment -->
+ <dimen name="section_title_divider_view_layout_margin_top">32dp</dimen>
+ <dimen name="section_title_text_view_layout_margin_start">28dp</dimen>
+ <dimen name="section_title_text_view_layout_margin_top">28dp</dimen>
+ <dimen name="section_title_text_view_layout_margin_end">32dp</dimen>
+
 </resources>