Skip to content

Use navigation rail on 590dp+ wide screens #957

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

Draft
wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

Use navigation rail on 590dp+ wide screens #957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/src/main/java/com/battlelancer/seriesguide/ui/BaseTopActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import com.battlelancer.seriesguide.ui.ShowsActivity
import com.battlelancer.seriesguide.util.SupportTheDev
import com.battlelancer.seriesguide.util.SupportTheDev.buildSnackbar
import com.battlelancer.seriesguide.util.Utils
import com.google.android.material.bottomnavigation.BottomNavigationView
import com.google.android.material.navigation.NavigationBarView
import com.google.android.material.snackbar.Snackbar
import timber.log.Timber

Expand Down Expand Up @@ -72,7 +72,7 @@ abstract class BaseTopActivity : BaseMessageActivity() {
}

fun setupBottomNavigation(@IdRes selectedItemId: Int) {
val bottomNav = findViewById<BottomNavigationView>(R.id.bottomNavigation)
val bottomNav = findViewById<NavigationBarView>(R.id.bottomNavigation)
bottomNav.selectedItemId = selectedItemId
// Disable hideous bold font for active item.
bottomNav.setItemTextAppearanceActiveBoldEnabled(false)
Expand Down
48 changes: 48 additions & 0 deletions app/src/main/res/layout-w600dp/activity_shows.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright 2023 Uwe Trottmann -->
<!-- SPDX-License-Identifier: Apache-2.0 -->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/rootLayoutShows"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">

<com.google.android.material.navigationrail.NavigationRailView
android:id="@+id/bottomNavigation"
android:layout_width="wrap_content"
android:layout_height="match_parent"
app:labelVisibilityMode="labeled"
app:menu="@menu/bottom_navigation_menu" />

<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordinatorLayoutShows"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">

<include layout="@layout/top_app_bar_scrolling_tabs_progress" />

<androidx.viewpager2.widget.ViewPager2
android:id="@+id/viewPagerTabs"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/buttonShowsAdd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_marginStart="0dp"
android:layout_marginTop="0dp"
android:layout_marginEnd="@dimen/fab_margin"
android:layout_marginBottom="@dimen/fab_margin"
android:contentDescription="@string/action_shows_add"
app:srcCompat="@drawable/ic_add_white_24dp" />

</androidx.coordinatorlayout.widget.CoordinatorLayout>

</LinearLayout>
8 changes: 8 additions & 0 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2023 Uwe Trottmann -->
<!-- SPDX-License-Identifier: Apache-2.0 -->

<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">

<!-- Text styles -->
Expand Down Expand Up @@ -246,6 +249,11 @@
<item name="materialThemeOverlay">@style/ThemeOverlay.SeriesGuide.BottomNavigationView</item>
</style>

<!-- NavigationRailView -->
<style name="Widget.SeriesGuide.NavigationRailView" parent="Widget.Material3.NavigationRailView">
<item name="materialThemeOverlay">@style/ThemeOverlay.SeriesGuide.BottomNavigationView</item>
</style>

<style name="ThemeOverlay.SeriesGuide.BottomNavigationView" parent="">
<!-- Used for Widget.Material3.BottomNavigationView.ActiveIndicator color -->
<item name="colorSecondaryContainer" tools:ignore="PrivateResource">?attr/colorPrimaryContainer</item>
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2023 Uwe Trottmann -->
<!-- SPDX-License-Identifier: Apache-2.0 -->

<resources xmlns:android="http://schemas.android.com/apk/res/android">

<!-- ####################################### -->
Expand Down Expand Up @@ -71,6 +74,7 @@
<item name="preferenceTheme">@style/ThemeOverlay.SeriesGuide.Preference</item>

<item name="bottomNavigationStyle">@style/Widget.SeriesGuide.BottomNavigationView</item>
<item name="navigationRailStyle">@style/Widget.SeriesGuide.NavigationRailView</item>

<item name="textAppearanceButton">@style/TextAppearance.SeriesGuide.Button</item>

Expand Down Expand Up @@ -143,6 +147,7 @@
<item name="preferenceTheme">@style/ThemeOverlay.SeriesGuide.Preference</item>

<item name="bottomNavigationStyle">@style/Widget.SeriesGuide.BottomNavigationView</item>
<item name="navigationRailStyle">@style/Widget.SeriesGuide.NavigationRailView</item>

<item name="textAppearanceButton">@style/TextAppearance.SeriesGuide.Button</item>

Expand Down