Merge branch 'localization-part5-introduce-app-string-translations-su…

…pport-and-refactor' into localization-part6-introduce-content-and-answer-translations-support
oppia · Sep 15, 2021 · d863e20 · d863e20
2 parents fafe5c3 + ebe2262
commit d863e20
Show file tree

Hide file tree

Showing 32 changed files with 349 additions and 749 deletions.
diff --git a/app/src/main/res/layout-land/coming_soon_topic_view.xml b/app/src/main/res/layout-land/coming_soon_topic_view.xml
diff --git a/app/src/main/res/layout-land/profile_chooser_fragment.xml b/app/src/main/res/layout-land/profile_chooser_fragment.xml
@@ -53,7 +53,7 @@
           android:id="@+id/profile_select_text"
           style="@style/Heading1"
           android:layout_marginStart="36dp"
-          android:layout_marginTop="64dp"
+          android:layout_marginTop="@dimen/profile_chooser_fragment_profile_select_text_margin_top"
           android:layout_marginEnd="36dp"
           android:text="@string/profile_chooser_select"
           android:textColor="@color/white"
@@ -65,7 +65,7 @@
           android:layout_width="match_parent"
           android:layout_height="match_parent"
           android:layout_marginStart="16dp"
-          android:layout_marginTop="12dp"
+          android:layout_marginTop="@dimen/profile_chooser_fragment_profile_recycler_view_margin_top"
           android:layout_marginEnd="16dp"
           android:clipToPadding="false"
           android:fadingEdge="horizontal"

diff --git a/app/src/main/res/layout-land/profile_chooser_profile_view.xml b/app/src/main/res/layout-land/profile_chooser_profile_view.xml
@@ -89,6 +89,7 @@
       android:id="@+id/add_profile_divider_view"
       android:layout_width="1dp"
       android:layout_height="match_parent"
+      android:layout_marginTop="@dimen/profile_chooser_profile_view_view_margin_top"
       android:layout_gravity="bottom"
       android:background="@color/oppiaProfileChooserDivider"
       android:visibility="@{hasProfileEverBeenAddedValue ? View.GONE : View.VISIBLE}"

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/coming_soon_topic_view.xml b/app/src/main/res/layout-sw600dp-land/coming_soon_topic_view.xml