Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-19 09:25:34 +00:00
Code Issues Releases Wiki Activity

For #21522: Wrap section titles on home (#21836)

Browse Source
This commit is contained in:
Elise Richards 2021-10-15 14:35:17 -07:00 committed by GitHub
parent 38b817cad1
commit 8906cfcc3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/compose/SectionHeader.kt
View File

@ -60,7 +60,7 @@ fun HomeSectionHeader(
fontSize = 16.sp, fontSize = 16.sp,
lineHeight = 20.sp lineHeight = 20.sp
), ),
maxLines = 1, maxLines = 2,
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
color = FirefoxTheme.colors.textPrimary color = FirefoxTheme.colors.textPrimary
) )

4
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/pocket/PocketStoriesViewHolder.kt
View File

@ -11,8 +11,10 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.compose.ui.platform.ViewCompositionStrategy
@ -98,6 +100,7 @@ fun PocketStories(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(horizontal = horizontalPadding.dp) .padding(horizontal = horizontalPadding.dp)
.wrapContentHeight(align = Alignment.Top)
) )
Spacer(Modifier.height(17.dp)) Spacer(Modifier.height(17.dp))
@ -111,6 +114,7 @@ fun PocketStories(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(horizontal = horizontalPadding.dp) .padding(horizontal = horizontalPadding.dp)
.wrapContentHeight(align = Alignment.Top)
) )
Spacer(Modifier.height(17.dp)) Spacer(Modifier.height(17.dp))

24
app/src/main/res/layout/history_metadata_header.xml
View File

@ -8,18 +8,20 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/home_item_horizontal_margin" android:layout_marginHorizontal="@dimen/home_item_horizontal_margin"
android:layout_marginTop="40dp"> android:layout_marginTop="40dp"
android:layout_marginBottom="16dp">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/header" android:id="@+id/header"
style="@style/Header16TextStyle" style="@style/Header16TextStyle"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="wrap_content"
android:text="@string/history_metadata_header_3"
android:maxLines="2" android:maxLines="2"
android:gravity="center_vertical" android:text="@string/history_metadata_header_3"
android:gravity="top"
android:paddingTop="1dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/show_all_button"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
@ -28,15 +30,15 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:text="@string/recent_tabs_show_all"
android:textColor="@color/home_show_all_button_text"
android:contentDescription="@string/past_explorations_show_all_content_description" android:contentDescription="@string/past_explorations_show_all_content_description"
android:paddingVertical="16dp" android:gravity="top"
android:insetTop="0dp"
android:minHeight="16dp"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:gravity="end"
android:maxLines="1" android:maxLines="1"
android:text="@string/recent_tabs_show_all"
android:textColor="@color/home_show_all_button_text"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

23
app/src/main/res/layout/recent_bookmarks_header.xml
View File

@ -14,14 +14,15 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/header" android:id="@+id/header"
style="@style/Header16TextStyle" style="@style/Header16TextStyle"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="wrap_content"
android:contentDescription="@string/recently_saved_bookmarks_content_description" android:contentDescription="@string/recently_saved_bookmarks_content_description"
android:maxLines="2" android:maxLines="2"
android:text="@string/recent_bookmarks_title" android:text="@string/recent_bookmarks_title"
android:gravity="center_vertical" android:gravity="top"
android:paddingTop="1dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/showAllBookmarksButton"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
@ -31,15 +32,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/recently_saved_show_all_content_description" android:contentDescription="@string/recently_saved_show_all_content_description"
android:gravity="top"
android:insetTop="0dp"
android:minHeight="16dp"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:gravity="end" android:maxLines="1"
android:nestedScrollingEnabled="false"
android:text="@string/recently_saved_show_all" android:text="@string/recently_saved_show_all"
android:textColor="@color/home_show_all_button_text" android:textColor="@color/home_show_all_button_text"
android:maxLines="1" app:layout_constraintEnd_toEndOf="parent"
android:scrollbars="none" app:layout_constraintTop_toTopOf="parent" />
android:nestedScrollingEnabled="false"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

29
app/src/main/res/layout/recent_tabs_header.xml
View File

@ -7,35 +7,38 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/home_item_horizontal_margin" android:layout_marginHorizontal="@dimen/home_item_horizontal_margin"
android:layout_marginTop="40dp"> android:layout_marginTop="40dp"
android:layout_marginBottom="16dp">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/header" android:id="@+id/header"
style="@style/Header16TextStyle" style="@style/Header16TextStyle"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="wrap_content"
android:text="@string/recent_tabs_header"
android:maxLines="2" android:maxLines="2"
android:gravity="center_vertical" android:text="@string/recent_tabs_header"
android:gravity="top"
android:paddingTop="1dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toStartOf="@id/show_all_button"
app:layout_constraintBottom_toBottomOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/show_all_button" android:id="@+id/show_all_button"
style="@style/Button14TextStyle" style="@style/Button14TextStyle"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:text="@string/recent_tabs_show_all"
android:textColor="@color/home_show_all_button_text"
android:contentDescription="@string/recent_tabs_show_all_content_description" android:contentDescription="@string/recent_tabs_show_all_content_description"
android:paddingVertical="16dp" android:gravity="top"
android:insetTop="0dp"
android:minHeight="16dp"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:gravity="end"
android:maxLines="1" android:maxLines="1"
android:nestedScrollingEnabled="false"
android:text="@string/recent_tabs_show_all"
android:textColor="@color/home_show_all_button_text"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>