Fix oppia#3583: Merge topic_practice_footer_view into single layout f…

…ile. (oppia#3644) * deleted one file of topic practice footer view * Merged `topic_practice_footer_view.xml` into 1 xml file * Delete misc.xml * Merged `topic_practice_footer_view.xml` into 1 xml file * added deleted files misc.xml and runConfigurations.xml * added space and capitalized the letters
kritigupta45 · Aug 6, 2021 · 4bfbcfa · 4bfbcfa
1 parent 43dcceb
commit 4bfbcfa
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 117 deletions.
diff --git a/app/src/main/res/layout-land/topic_practice_footer_view.xml b/app/src/main/res/layout-land/topic_practice_footer_view.xml
diff --git a/app/src/main/res/layout-sw600dp-land/topic_practice_footer_view.xml b/app/src/main/res/layout-sw600dp-land/topic_practice_footer_view.xml
diff --git a/app/src/main/res/layout-sw600dp-port/topic_practice_footer_view.xml b/app/src/main/res/layout-sw600dp-port/topic_practice_footer_view.xml
diff --git a/app/src/main/res/layout/topic_practice_footer_view.xml b/app/src/main/res/layout/topic_practice_footer_view.xml
@@ -22,8 +22,8 @@
  style="@style/StateButtonInactive"
  android:layout_width="160dp"
  android:layout_height="wrap_content"
- android:layout_marginTop="36dp"
- android:layout_marginBottom="108dp"
+ android:layout_marginTop="@dimen/topic_practice_footer_view_margin_top"
+ android:layout_marginBottom="@dimen/topic_practice_footer_view_margin_bottom"
  android:background="@{isSubmitButtonActive ? @drawable/state_button_primary_background :@drawable/state_button_inactive_background}"
  android:clickable="@{isSubmitButtonActive}"
  android:enabled="@{isSubmitButtonActive}"

diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -291,4 +291,8 @@
  <dimen name="coming_soon_topic_promoted_list_view_padding_start">0dp</dimen>
  <dimen name="coming_soon_topic_Promoted_list_view_padding_end">0dp</dimen>
 
+ <!-- Topic Practice Footer View -->
+ <dimen name="topic_practice_footer_view_margin_top">24dp</dimen>
+ <dimen name="topic_practice_footer_view_margin_bottom">0dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -293,4 +293,8 @@
  <dimen name="coming_soon_topic_promoted_list_view_padding_start">0dp</dimen>
  <dimen name="coming_soon_topic_Promoted_list_view_padding_end">0dp</dimen>
 
+ <!-- Topic Practice Footer View -->
+ <dimen name="topic_practice_footer_view_margin_top">24dp</dimen>
+ <dimen name="topic_practice_footer_view_margin_bottom">0dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -451,4 +451,8 @@
  <dimen name="coming_soon_topic_promoted_list_view_padding_start">28dp</dimen>
  <dimen name="coming_soon_topic_Promoted_list_view_padding_end">28dp</dimen>
 
+ <!-- Topic Practice Footer View -->
+ <dimen name="topic_practice_footer_view_margin_top">36dp</dimen>
+ <dimen name="topic_practice_footer_view_margin_bottom">108dp</dimen>
+
 </resources>