Fix oppia#3568 merged the Promoted_story_card xmls (oppia#3767)

* merged the Promoted_story_card xmls * dimens renamed * dimen changed * changed promoted_story_card_width to 280 dp * removed the common attribute from dimen files
kritigupta45 · Sep 14, 2021 · ff485e9 · ff485e9
1 parent 92ce46b
commit ff485e9
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 312 deletions.
diff --git a/app/src/main/res/layout-land/promoted_story_card.xml b/app/src/main/res/layout-land/promoted_story_card.xml
diff --git a/app/src/main/res/layout-sw600dp-land/promoted_story_card.xml b/app/src/main/res/layout-sw600dp-land/promoted_story_card.xml
diff --git a/app/src/main/res/layout-sw600dp-port/promoted_story_card.xml b/app/src/main/res/layout-sw600dp-port/promoted_story_card.xml
diff --git a/app/src/main/res/layout/promoted_story_card.xml b/app/src/main/res/layout/promoted_story_card.xml
@@ -12,9 +12,9 @@
  </data>
 
  <com.google.android.material.card.MaterialCardView
- android:layout_width="match_parent"
+ android:layout_width="@dimen/promoted_story_card_layout_width"
  android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
+ android:layout_marginStart="@dimen/promoted_story_card_layout_margin_start"
  android:layout_marginEnd="8dp"
  android:layout_marginBottom="8dp"
  app:cardCornerRadius="4dp"
@@ -80,14 +80,14 @@
  android:maxLines="1"
  android:text="@{viewModel.promotedStory.storyName}"
  android:textColor="@color/oppiaPrimaryText"
- android:textSize="16sp" />
+ android:textSize="@dimen/promoted_story_card_text_size" />
 
  <TextView
  android:id="@+id/topic_name_text_view"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:layout_marginStart="16dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="@dimen/promoted_story_card_margin_top"
  android:layout_marginEnd="16dp"
  android:ellipsize="end"
  android:fontFamily="sans-serif-light"

diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
@@ -302,4 +302,9 @@
 
  <dimen name="home_fragment_padding_top">40dp</dimen>
  <dimen name="home_fragment_padding_bottom">96dp</dimen>
+
+ <dimen name="promoted_story_card_layout_margin_end">8dp</dimen>
+ <dimen name="promoted_story_card_layout_margin_start">8dp</dimen>
+ <dimen name="promoted_story_card_text_size">14sp</dimen>
+ <dimen name="promoted_story_card_margin_top">8dp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -322,4 +322,9 @@
 
  <dimen name="home_fragment_padding_top">48dp</dimen>
  <dimen name="home_fragment_padding_bottom">100dp</dimen>
+
+ <dimen name="promoted_story_card_layout_margin_start">0dp</dimen>
+ <dimen name="promoted_story_card_layout_margin_end">32dp</dimen>
+ <dimen name="promoted_story_card_text_size">16sp</dimen>
+ <dimen name="promoted_story_card_margin_top">4dp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -324,5 +324,9 @@
 
  <dimen name="home_fragment_padding_top">48dp</dimen>
  <dimen name="home_fragment_padding_bottom">100dp</dimen>
-
+
+ <dimen name="promoted_story_card_layout_margin_start">8dp</dimen>
+ <dimen name="promoted_story_card_layout_margin_end">24dp</dimen>
+ <dimen name="promoted_story_card_text_size">16sp</dimen>
+ <dimen name="promoted_story_card_margin_top">4dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -490,4 +490,10 @@
 
  <dimen name="home_fragment_padding_top">36dp</dimen>
  <dimen name="home_fragment_padding_bottom">148dp</dimen>
+
+ <dimen name="promoted_story_card_layout_margin_end">8dp</dimen>
+ <dimen name="promoted_story_card_layout_margin_start">8dp</dimen>
+ <dimen name="promoted_story_card_layout_width">280dp</dimen>
+ <dimen name="promoted_story_card_text_size">16sp</dimen>
+ <dimen name="promoted_story_card_margin_top">8dp</dimen>
 </resources>