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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 9 commits into from
Jan 17, 2022
Merged

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cfc4e30
topic_lessons_title port and land merged
shivambh12 Dec 4, 2021
2ef505c
No such changes
shivambh12 Dec 4, 2021
34db096
topic_lessons_title merged into 2 xml.
shivambh12 Dec 9, 2021
b2afe62
No such changes
shivambh12 Jan 3, 2022
a021c56
Removed extra space
shivambh12 Jan 3, 2022
6fffdf0
Successfully merged
shivambh12 Jan 9, 2022
18b90fa
Required Changes Applied
shivambh12 Jan 9, 2022
408f998
Fetching latest commits from upstream.
shivambh12 Jan 16, 2022
3dfde90
Nit Changes
shivambh12 Jan 16, 2022
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
29 changes: 0 additions & 29 deletions app/src/main/res/layout-land/topic_lessons_title.xml
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions app/src/main/res/layout-sw600dp-land/topic_lessons_title.xml
View file
Open in desktop

This file was deleted.

0 ...yout-sw600dp-port/topic_lessons_title.xml → ...es/layout-sw600dp/topic_lessons_title.xml
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions app/src/main/res/layout/topic_lessons_title.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
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:textColor="@color/oppiaPrimaryText"
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values-land/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,4 +384,8 @@
<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>
4 changes: 4 additions & 0 deletions app/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,4 +584,8 @@
<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>