Skip to content

Feat: Expandable navigation rail on focus #1853

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: master
Choose a base branch
from
+36 −3
Draft

Feat: Expandable navigation rail on focus #1853

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
29 changes: 29 additions & 0 deletions app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1709,6 +1709,35 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
}
}

val rail = binding?.navRailView
if (rail != null && isLayout(TV)) {
val focus = mutableSetOf<Int>()
for (id in arrayOf(
R.id.navigation_home,
R.id.navigation_library,
R.id.navigation_search,
R.id.navigation_downloads,
R.id.navigation_settings
)) {
rail.findViewById<View?>(id)?.onFocusChangeListener =
View.OnFocusChangeListener { v, hasFocus ->
if (hasFocus) {
focus += id
binding?.navRailView?.labelVisibilityMode = NavigationRailView.LABEL_VISIBILITY_LABELED
binding?.navRailView?.expand()
} else {
focus -= id
v.post {
if(focus.isEmpty()) {
binding?.navRailView?.labelVisibilityMode = NavigationRailView.LABEL_VISIBILITY_UNLABELED
binding?.navRailView?.collapse()
}
}
}
}
}
}

// Navigation button long click functionality to scroll to top
for (view in listOf(binding?.navView, binding?.navRailView)) {
view?.findViewById<View?>(R.id.navigation_home)?.setOnLongClickListener {
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/res/layout/activity_main_tv.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,18 @@

<com.google.android.material.navigationrail.NavigationRailView
android:id="@+id/nav_rail_view"
android:layout_width="62dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:minWidth="62dp"
android:maxWidth="62dp"
app:expanded="false"
app:expandedMaxWidth="180dp"
app:itemIconTint="@color/item_select_color"
app:itemTextColor="@color/item_select_color"
android:background="?attr/primaryGrayBackground"
android:descendantFocusability="afterDescendants"
app:headerLayout="@layout/rail_header"
app:labelVisibilityMode="unlabeled"
app:labelVisibilityMode="labeled"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:menu="@menu/bottom_nav_menu"
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ kotlinGradlePluginVersion = "2.1.10"
kotlinxCoroutinesCore = "1.10.1"
lifecycleLivedataKtx = "2.8.7"
lifecycleViewmodelKtx = "2.8.7"
material = "1.12.0"
material = "1.14.0-alpha04"
media3 = "1.6.1"
navigationKtx = "2.8.9"
newpipeextractor = "v0.24.6"
Expand Down