Skip to content

Commit

Permalink
Merge branch 'layout-fixes' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
UweTrottmann committed Oct 19, 2023
2 parents ae5763b + f3e9a26 commit 3db2a10
Show file tree
Hide file tree
Showing 42 changed files with 57 additions and 26 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Version 70
*in development*

* 🔨 Get started: allow notification button now stays hidden after granting notification permission.
* 🔨 User interface: restore scrollbars wherever they were missing.

#### 70.0.0 🧪
*2023-09-21*
Expand Down
1 change: 1 addition & 0 deletions app/src/amazon/res/layout/activity_amazon_billing.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

<androidx.core.widget.NestedScrollView
android:id="@+id/scrollViewAmazonBilling"
style="@style/Widget.SeriesGuide.NestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import com.battlelancer.seriesguide.databinding.FragmentCommentsBinding
import com.battlelancer.seriesguide.traktapi.TraktAction
import com.battlelancer.seriesguide.traktapi.TraktTask
import com.battlelancer.seriesguide.traktapi.TraktTask.TraktActionCompleteEvent
import com.battlelancer.seriesguide.ui.widgets.SgFastScroller
import com.battlelancer.seriesguide.util.Errors
import com.battlelancer.seriesguide.util.ThemeUtils
import com.battlelancer.seriesguide.util.ViewTools
Expand Down Expand Up @@ -108,6 +109,7 @@ class TraktCommentsFragment : Fragment() {
})

// set initial view states
SgFastScroller(requireContext(), binding.recyclerViewComments)
binding.recyclerViewComments.isGone = false
binding.textViewShoutsEmpty.isGone = true
showProgressBar(true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import com.battlelancer.seriesguide.lists.database.SgListItemWithDetails
import com.battlelancer.seriesguide.provider.SeriesGuideContract.ListItemTypes
import com.battlelancer.seriesguide.ui.AutoGridLayoutManager
import com.battlelancer.seriesguide.ui.OverviewActivity
import com.battlelancer.seriesguide.ui.widgets.SgFastScroller
import com.battlelancer.seriesguide.util.Utils
import com.battlelancer.seriesguide.util.ViewTools
import org.greenrobot.eventbus.EventBus
Expand Down Expand Up @@ -57,6 +58,7 @@ class SgListFragment : Fragment() {
val adapter = SgListItemAdapter(requireContext(), onItemClickListener)

val recyclerView = binding.recyclerViewListItems.also {
SgFastScroller(requireContext(), it)
it.setHasFixedSize(true)
it.layoutManager =
AutoGridLayoutManager(
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/layout-w1024dp/fragment_movie.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

<androidx.core.widget.NestedScrollView
android:id="@+id/contentContainerMovie"
style="@style/Widget.SeriesGuide.NestedScrollView"
android:layout_width="740dp"
android:layout_height="match_parent"
android:clipToPadding="false">
Expand Down Expand Up @@ -260,6 +261,7 @@

<androidx.core.widget.NestedScrollView
android:id="@+id/contentContainerMovieRight"
style="@style/Widget.SeriesGuide.NestedScrollView"
android:layout_width="230dp"
android:layout_height="match_parent"
android:layout_marginLeft="740dp"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout-w590dp/fragment_movie.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

<androidx.core.widget.NestedScrollView
android:id="@+id/contentContainerMovie"
style="@style/Widget.SeriesGuide.NestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false">
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout-w820dp/fragment_comments.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
</ScrollView>

<!-- Add enough bottom padding so last item is above powered by text. -->
<!-- Setting fast scroller in code. -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewComments"
android:layout_width="match_parent"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_billing.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

<androidx.core.widget.NestedScrollView
android:id="@+id/containerBilling"
style="@style/Widget.SeriesGuide.NestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false">
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_more_options.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<include layout="@layout/top_app_bar_elevating" />

<androidx.core.widget.NestedScrollView
style="@style/Widget.SeriesGuide.NestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/auth_picker_email_google.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/Widget.SeriesGuide.NestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false">
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/dialog_localization.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewLocalization"
style="@style/Widget.SeriesGuide.RecyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/dialog_manage_lists.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewManageLists"
style="@style/Widget.SeriesGuide.RecyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:scrollbars="vertical"
tools:listitem="@layout/item_list_checked" />

</LinearLayout>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/dialog_notification_selection.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewSelection"
style="@style/Widget.SeriesGuide.RecyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:paddingBottom="@dimen/default_padding"
android:paddingTop="@dimen/default_padding"
android:scrollbars="vertical"
tools:listitem="@layout/item_notification_selection" />

</LinearLayout>
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_about.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

<androidx.core.widget.NestedScrollView
android:id="@+id/scrollViewAbout"
style="@style/Widget.SeriesGuide.NestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_auto_backup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

<androidx.core.widget.NestedScrollView
android:id="@+id/scrollViewAutoBackup"
style="@style/Widget.SeriesGuide.NestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false">
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_calendar_recent.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
android:layout_height="match_parent"
tools:context=".shows.calendar.RecentFragment">

<!-- Setting fast scroller in code. -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewCalendarRecent"
android:layout_width="match_parent"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_calendar_upcoming.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
android:layout_height="match_parent"
tools:context=".shows.calendar.UpcomingFragment">

<!-- Setting fast scroller in code. -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewCalendarUpcoming"
android:layout_width="match_parent"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_cloud_setup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/scrollViewCloud"
style="@style/Widget.SeriesGuide.NestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false">
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_comments.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
</ScrollView>

<!-- Add enough bottom padding so last item is above powered by text. -->
<!-- Setting fast scroller in code. -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewComments"
android:layout_width="match_parent"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/scrollViewTraktCredentials"
style="@style/Widget.SeriesGuide.NestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false">
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_data_liberation.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

<androidx.core.widget.NestedScrollView
android:id="@+id/scrollViewDataLiberation"
style="@style/Widget.SeriesGuide.NestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_episode.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>

<!-- Enable nested scrolling to work with CoordinatorLayout. -->
<!-- Use native ScrollView as it behaves better than NestedScrollView when scrolling in view pager -->
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/scrollViewEpisode"
style="@style/Widget.SeriesGuide.NestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_episodes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
</com.google.android.material.card.MaterialCardView>

<!-- Enable nested scrolling to work with CoordinatorLayout. -->
<!-- Setting fast scroller in code. -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewEpisodes"
android:layout_width="0dp"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
tools:drawableTint="?attr/sgColorIcon"
tools:drawableTop="@drawable/ic_list_white_24dp" />

<!-- Setting fast scroller in code. -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewListItems"
android:layout_width="match_parent"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_movie.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

<androidx.core.widget.NestedScrollView
android:id="@+id/contentContainerMovie"
style="@style/Widget.SeriesGuide.NestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false">
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/layout/fragment_movies_discover.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewMoviesDiscover"
style="@style/Widget.SeriesGuide.RecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingBottom="@dimen/grid_item_margin_vertical"
android:paddingLeft="@dimen/grid_item_margin_horizontal"
android:paddingRight="@dimen/grid_item_margin_horizontal"
android:paddingTop="@dimen/grid_item_margin_vertical"
android:scrollbarStyle="outsideOverlay"
android:scrollbars="vertical"
tools:listitem="@layout/item_discover_movie" />

</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
3 changes: 1 addition & 2 deletions app/src/main/res/layout/fragment_movies_search.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,14 @@
<!-- Add enough bottom padding so last item is above powered by text. -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewMoviesSearch"
style="@style/Widget.SeriesGuide.RecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingLeft="@dimen/grid_item_margin_horizontal"
android:paddingTop="@dimen/grid_item_margin_vertical"
android:paddingRight="@dimen/grid_item_margin_horizontal"
android:paddingBottom="40dp"
android:scrollbarStyle="outsideOverlay"
android:scrollbars="vertical"
tools:listitem="@layout/item_discover_movie" />

<TextView
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_movies_watched.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
android:text="@string/now_movies_empty"
android:textAppearance="@style/TextAppearance.SeriesGuide.EmptyState" />

<!-- Setting fast scroller in code. -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewMoviesWatched"
android:layout_width="match_parent"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/fragment_now.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

<androidx.core.widget.NestedScrollView
android:id="@+id/scrollViewNow"
style="@style/Widget.SeriesGuide.NestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent">

Expand All @@ -26,13 +27,12 @@

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewNow"
style="@style/Widget.SeriesGuide.RecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:scrollbarStyle="outsideOverlay"
android:scrollbars="vertical" />
android:paddingBottom="8dp" />

<!-- Use of CoordinatorLayout shifts layouts down, counter by moving inline snackbar up. -->
<include
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_overview.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<!-- Enable nested scrolling to scroll app bar, fix fling to top registering. -->
<androidx.core.widget.NestedScrollView
android:id="@+id/scrollViewOverview"
style="@style/Widget.SeriesGuide.NestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_seasons.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
<!-- Enable nested scrolling for Lollipop and up to scroll app bar. -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewSeasons"
style="@style/Widget.SeriesGuide.RecyclerView"
android:layout_width="0dp"
android:layout_height="0dp"
android:clipToPadding="false"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_show_narrow.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/scrollViewShow"
style="@style/Widget.SeriesGuide.NestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_show_regular.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/scrollViewShow"
style="@style/Widget.SeriesGuide.NestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_shows.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
tools:drawableTop="@drawable/ic_filter_white_24dp" />

<!-- Add large bottom padding to make room for FAB if scrolled to bottom. -->
<!-- Setting fast scroller in code. -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewShows"
android:layout_width="match_parent"
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/layout/fragment_shows_discover.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,12 @@
<!-- Add enough bottom padding so last item is above powered by text. -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewShowsDiscover"
style="@style/Widget.SeriesGuide.RecyclerView"
android:layout_width="0dp"
android:layout_height="0dp"
android:clipToPadding="false"
android:paddingTop="8dp"
android:paddingBottom="40dp"
android:scrollbarStyle="outsideOverlay"
android:scrollbars="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_shows_discover_filter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
using ConstraintLayout does not match available space. -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewWatchProviders"
style="@style/Widget.SeriesGuide.RecyclerView"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/layout/fragment_shows_popular.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@
<!-- Add enough bottom padding so last item is above powered by text. -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewShowsPopular"
style="@style/Widget.SeriesGuide.RecyclerView"
android:layout_width="0dp"
android:layout_height="0dp"
android:clipToPadding="false"
android:paddingTop="8dp"
android:paddingBottom="40dp"
android:scrollbarStyle="outsideOverlay"
android:scrollbars="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/layout/fragment_shows_similar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,12 @@
<!-- Add enough bottom padding so last item is above powered by text. -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewShowsSimilar"
style="@style/Widget.SeriesGuide.RecyclerView"
android:layout_width="0dp"
android:layout_height="0dp"
android:clipToPadding="false"
android:paddingTop="8dp"
android:paddingBottom="40dp"
android:scrollbarStyle="outsideOverlay"
android:scrollbars="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
Loading

0 comments on commit 3db2a10

Please sign in to comment.