Skip to content

[Site Creation] Align screen titles to left (right for RTL) #16556

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

Merged
antonis merged 7 commits into from
May 16, 2022
Merged

[Site Creation] Align screen titles to left (right for RTL) #16556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9dbd048
Align collapsing titles on site creation screens to textStart
ovitrif May 14, 2022
eb9e6e2
Align header title & subtitle on site creation screens to textStart
ovitrif May 14, 2022
af3d168
Use site creation header v2 in site theme screen for consistency
ovitrif May 14, 2022
d3af3a3
Rename appbar title id in site theme titlebar to avoid DuplicateInclu…
ovitrif May 16, 2022
f3c6c21
Remove unused dimension resource siq_title_padding_start
ovitrif May 16, 2022
157d929
Remove redundant horizontal margins override in the site creation hea…
ovitrif May 16, 2022
fc56927
Merge branch 'feature/site-design-revamp' into issue/16551-align-site…
antonis May 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
13 changes: 4 additions & 9 deletions ...Press/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,8 @@ class HomePagePickerFragment : Fragment() {
}

private fun HomePagePickerFragmentBinding.setupUi() {
with(modalLayoutPickerHeaderSection) {
modalLayoutPickerTitleRow?.header?.apply {
textAlignment = View.TEXT_ALIGNMENT_TEXT_START
setText(R.string.hpp_title)
}
modalLayoutPickerSubtitleRow?.root?.visibility = View.GONE
}
siteCreationThemeHeader.title?.setText(R.string.hpp_title)
siteCreationThemeHeader.subtitle?.isGone = true
modalLayoutPickerLayoutsSkeleton.skeletonCardView.updateLayoutParams {
height = thumbDimensionProvider.previewHeight
width = thumbDimensionProvider.previewWidth
Expand Down Expand Up @@ -138,8 +133,8 @@ class HomePagePickerFragment : Fragment() {

private fun HomePagePickerFragmentBinding.setHeaderVisibility(visible: Boolean) {
uiHelper.fadeInfadeOutViews(
homePagePickerTitlebar.title,
modalLayoutPickerHeaderSection.modalLayoutPickerTitleRow?.header,
homePagePickerTitlebar.appBarTitle,
siteCreationThemeHeader.title,
visible
)
}
Expand Down
4 changes: 2 additions & 2 deletions WordPress/src/main/res/layout/home_page_picker_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
app:layout_scrollFlags="scroll|exitUntilCollapsed">

<include
android:id="@+id/modal_layout_picker_header_section"
layout="@layout/modal_layout_picker_header_section"
android:id="@+id/site_creation_theme_header"
layout="@layout/site_creation_header_v2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
Expand Down
2 changes: 1 addition & 1 deletion WordPress/src/main/res/layout/home_page_picker_titlebar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
android:tint="?attr/colorOnSurface" />

<TextView
android:id="@+id/title"
android:id="@+id/appBarTitle"
style="@style/ModalLayoutPickerHeader"
android:layout_width="0dp"
android:layout_weight="1"
Expand Down
4 changes: 2 additions & 2 deletions WordPress/src/main/res/layout/site_creation_header_v2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<org.wordpress.android.widgets.WPTextView
android:id="@+id/title"
style="@style/ModalLayoutPickerTitle"
style="@style/SiteCreationHeaderV2Title"
android:lineSpacingExtra="-4sp"
android:letterSpacing="0.01"
android:paddingBottom="@dimen/margin_large"
Expand All @@ -18,7 +18,7 @@

<org.wordpress.android.widgets.WPTextView
android:id="@+id/subtitle"
style="@style/ModalLayoutPickerSubtitle"
style="@style/SiteCreationHeaderV2Subtitle"
android:paddingBottom="@dimen/margin_extra_medium_large"
android:lineSpacingExtra="5sp"
android:letterSpacing="0.01"
Expand Down
3 changes: 1 addition & 2 deletions WordPress/src/main/res/layout/site_creation_intents_titlebar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
style="@style/ModalLayoutPickerHeader"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_marginStart="@dimen/siq_title_padding_start"
android:layout_marginEnd="0dp"
android:textAlignment="textStart"
android:text="@string/new_site_creation_intents_title" />

<Button
Expand Down
1 change: 0 additions & 1 deletion WordPress/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,6 @@
<dimen name="hpp_recommended_row_height">500dp</dimen>

<!-- Site Intent Question -->
<dimen name="siq_title_padding_start">@dimen/margin_extra_extra_large</dimen>
<dimen name="siq_header_scroll_snap_threshold">-96dp</dimen>

<!-- Login Prologue -->
Expand Down
28 changes: 28 additions & 0 deletions WordPress/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1488,6 +1488,34 @@
<item name="android:paddingBottom">@dimen/margin_small_medium</item>
</style>

<!-- Site Creation Header Styles -->

<style name="SiteCreationHeaderV2Text">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textAlignment">textStart</item>
<item name="android:textColor">?attr/colorOnSurface</item>
<item name="android:ellipsize">end</item>
</style>

<style name="SiteCreationHeaderV2Title" parent="SiteCreationHeaderV2Text">
<item name="android:paddingTop">@dimen/mlp_titles_top_margin</item>
<item name="android:paddingBottom">@dimen/margin_small_medium</item>
<item name="android:textAppearance">?attr/textAppearanceHeadline4</item>
<item name="android:textStyle">bold</item>
<item name="android:maxLines">3</item>
<item name="fontFamily">serif</item>
</style>

<style name="SiteCreationHeaderV2Subtitle" parent="SiteCreationHeaderV2Text">
<item name="android:paddingTop">@dimen/margin_small</item>
<item name="android:paddingBottom">@dimen/mlp_titles_bottom_margin</item>
<item name="android:textAppearance">?attr/textAppearanceBody1</item>
<item name="android:maxLines">5</item>
<item name="android:alpha">0.6</item>
<item name="fontFamily">sans-serif</item>
</style>

<!-- Modal Layout Picker Styles -->

<style name="ModalLayoutPickerText">
Expand Down