Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #3582 :Merge topic_lessons_title.xml into single xml file #4036

Merged
merged 9 commits into from
Jan 17, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
topic_lessons_title port and land merged
  • Loading branch information
shivambh12 committed Dec 4, 2021
commit cfc4e30ad78f7894bdbb7f392e90959e1388cabd
29 changes: 0 additions & 29 deletions app/src/main/res/layout-land/topic_lessons_title.xml

This file was deleted.

8 changes: 4 additions & 4 deletions app/src/main/res/layout/topic_lessons_title.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
android:id="@+id/topic_play_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginTop="32dp"
android:layout_marginEnd="32dp"
android:layout_marginStart="@dimen/topic_lessons_title_margin_start"
android:layout_marginTop="@dimen/topic_lessons_title_margin_top"
android:layout_marginEnd="@dimen/topic_lessons_title_margin_end"
android:fontFamily="sans-serif-medium"
android:text="@string/stories_you_can_play"
android:text="stories_you_can_play"
android:textColor="@color/oppiaPrimaryText"
android:textSize="20sp" />
</FrameLayout>
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/res/values-land/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -383,5 +383,8 @@
<dimen name="profile_rename_activity_profile_rename_input_margin_top">32dp</dimen>
<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>

<!-- TopicLessonsTitle -->
<dimen name="topic_lessons_title_margin_start">100dp</dimen>
<dimen name="topic_lessons_title_margin_top">32dp</dimen>
<dimen name="topic_lessons_title_margin_end">100dp</dimen>
Arjupta marked this conversation as resolved.
Show resolved Hide resolved
</resources>
5 changes: 4 additions & 1 deletion app/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -583,5 +583,8 @@
<dimen name="profile_rename_activity_profile_rename_input_margin_top">28dp</dimen>
<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>

<!-- TopicLessonsTitle -->
<dimen name="topic_lessons_title_margin_start">32dp</dimen>
<dimen name="topic_lessons_title_margin_top">32dp</dimen>
<dimen name="topic_lessons_title_margin_end">32dp</dimen>
</resources>