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

Fix #2749: Fixes Home Card UI #5185

Merged
merged 12 commits into from
Feb 19, 2024
Merged

Fix #2749: Fixes Home Card UI #5185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0b5bb05
Fixes padding and margin
theMr17 Oct 11, 2023
25ec1a6
Fixes landscape padding & margin
theMr17 Nov 17, 2023
f7eda51
Merge branch 'develop' into fix/home-tablet-ui
theMr17 Dec 4, 2023
99c7939
Merge branch 'develop' into fix/home-tablet-ui
theMr17 Dec 14, 2023
d761c39
Merge branch 'develop' into fix/home-tablet-ui
theMr17 Dec 22, 2023
c205ed7
Merge branch 'develop' into fix/home-tablet-ui
theMr17 Dec 29, 2023
f6efbd1
Merge branch 'develop' into fix/home-tablet-ui
theMr17 Jan 5, 2024
0685008
Merge branch 'develop' into fix/home-tablet-ui
theMr17 Jan 12, 2024
aef535f
Merge branch 'develop' into fix/home-tablet-ui
theMr17 Jan 31, 2024
7335662
Merge branch 'develop' into fix/home-tablet-ui
theMr17 Feb 7, 2024
9021c88
Merge branch 'develop' into fix/home-tablet-ui
theMr17 Feb 14, 2024
3cca111
Merge branch 'develop' into fix/home-tablet-ui
adhiamboperes Feb 19, 2024
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
14 changes: 7 additions & 7 deletions app/src/main/res/values-sw600dp-land/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<dimen name="home_padding_end">64dp</dimen>
<dimen name="home_padding_start">96dp</dimen>
<dimen name="home_outer_margin">96dp</dimen>
<dimen name="home_welcome_outer_padding">96dp</dimen>
<dimen name="home_padding_start">72dp</dimen>
<dimen name="home_outer_margin">72dp</dimen>
<dimen name="home_welcome_outer_padding">72dp</dimen>
<dimen name="home_welcome_text_view_margin_end">8dp</dimen>
<dimen name="home_inner_margin">64dp</dimen>
<dimen name="home_inner_margin">48dp</dimen>
<dimen name="recently_played_margin_max">96dp</dimen>
<dimen name="recently_played_margin_min">64dp</dimen>
<dimen name="drag_drop_item_exploration_split_view_margin_start">32dp</dimen>
Expand Down Expand Up @@ -276,7 +276,7 @@
<dimen name="concept_card_explanation_text_margin_end">176dp</dimen>

<!-- All Topics -->
<dimen name="all_topics_text_margin_start">96dp</dimen>
<dimen name="all_topics_text_margin_start">72dp</dimen>
<dimen name="all_topics_text_margin_top">68dp</dimen>
<dimen name="all_topics_text_margin_end">76dp</dimen>
<dimen name="all_topics_text_margin_bottom">24dp</dimen>
Expand Down Expand Up @@ -444,8 +444,8 @@
<dimen name="topic_practice_fragment_padding_bottom">112dp</dimen>

<!-- PromotedStoryList-->
<dimen name="promoted_story_list_layout_margin_end">96dp</dimen>
<dimen name="promoted_story_list_layout_margin_start">96dp</dimen>
<dimen name="promoted_story_list_layout_margin_end">72dp</dimen>
<dimen name="promoted_story_list_layout_margin_start">72dp</dimen>

<!-- AudioLanguageFragment -->
<dimen name="audio_language_recycler_view_padding_bottom">132dp</dimen>
Expand Down
18 changes: 9 additions & 9 deletions app/src/main/res/values-sw600dp-port/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<dimen name="home_padding_end">96dp</dimen>
<dimen name="home_padding_start">120dp</dimen>
<dimen name="home_outer_margin">120dp</dimen>
<dimen name="home_welcome_outer_padding">120dp</dimen>
<dimen name="home_padding_start">56dp</dimen>
<dimen name="home_outer_margin">64dp</dimen>
<dimen name="home_welcome_outer_padding">60dp</dimen>
<dimen name="home_welcome_text_view_margin_end">8dp</dimen>
<dimen name="home_inner_margin">60dp</dimen>
<dimen name="home_inner_margin">32dp</dimen>
<dimen name="recently_played_margin_max">120dp</dimen>
<dimen name="recently_played_margin_min">60dp</dimen>
<dimen name="drag_drop_item_exploration_split_view_margin_start">32dp</dimen>
Expand Down Expand Up @@ -281,10 +281,10 @@
<dimen name="concept_card_explanation_text_margin_end">128dp</dimen>

<!-- All Topics -->
<dimen name="all_topics_text_margin_start">120dp</dimen>
<dimen name="all_topics_text_margin_top">68dp</dimen>
<dimen name="all_topics_text_margin_start">60dp</dimen>
<dimen name="all_topics_text_margin_top">52dp</dimen>
<dimen name="all_topics_text_margin_end">76dp</dimen>
<dimen name="all_topics_text_margin_bottom">24dp</dimen>
<dimen name="all_topics_text_margin_bottom">16dp</dimen>

<!-- Coming Soon Topic List -->
<dimen name="coming_soon_topic_list_constraint_layout_padding_start">120dp</dimen>
Expand Down Expand Up @@ -441,8 +441,8 @@
<dimen name="topic_practice_fragment_padding_bottom">112dp</dimen>

<!-- PromotedStoryList-->
<dimen name="promoted_story_list_layout_margin_end">120dp</dimen>
<dimen name="promoted_story_list_layout_margin_start">120dp</dimen>
<dimen name="promoted_story_list_layout_margin_end">60dp</dimen>
<dimen name="promoted_story_list_layout_margin_start">60dp</dimen>

<!-- AudioLanguageFragment -->
<dimen name="audio_language_recycler_view_padding_bottom">132dp</dimen>
Expand Down
Loading