nomad/ananas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix library up button and toolbar title

Browse source
This commit is contained in:
Jarne Demeulemeester 2021-06-19 18:27:11 +02:00
parent 20bc0632ef
commit f4207a88f5
No known key found for this signature in database
GPG key ID: B61B7B150DB6A6D2
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/dev/jdtech/jellyfin/MainActivity.kt
View file

@ -38,4 +38,9 @@ class MainActivity : AppCompatActivity() {
setupActionBarWithNavController(navController, appBarConfiguration) setupActionBarWithNavController(navController, appBarConfiguration)
navView.setupWithNavController(navController) navView.setupWithNavController(navController)
} }
override fun onSupportNavigateUp(): Boolean {
onBackPressed()
return true
}
} }

3
app/src/main/java/dev/jdtech/jellyfin/fragments/MediaFragment.kt
View file

@ -26,7 +26,8 @@ class MediaFragment : Fragment() {
CollectionListAdapter(CollectionListAdapter.OnClickListener { library -> CollectionListAdapter(CollectionListAdapter.OnClickListener { library ->
findNavController().navigate( findNavController().navigate(
MediaFragmentDirections.actionNavigationMediaToLibraryFragment( MediaFragmentDirections.actionNavigationMediaToLibraryFragment(
library.id library.id,
library.name
) )
) )

11
app/src/main/res/navigation/main_navigation.xml
View file

@ -15,7 +15,7 @@
android:id="@+id/navigation_media" android:id="@+id/navigation_media"
android:name="dev.jdtech.jellyfin.fragments.MediaFragment" android:name="dev.jdtech.jellyfin.fragments.MediaFragment"
android:label="@string/title_media" android:label="@string/title_media"
tools:layout="@layout/fragment_media" > tools:layout="@layout/fragment_media">
<action <action
android:id="@+id/action_navigation_media_to_libraryFragment" android:id="@+id/action_navigation_media_to_libraryFragment"
app:destination="@id/libraryFragment" /> app:destination="@id/libraryFragment" />
@ -29,10 +29,15 @@
<fragment <fragment
android:id="@+id/libraryFragment" android:id="@+id/libraryFragment"
android:name="dev.jdtech.jellyfin.fragments.LibraryFragment" android:name="dev.jdtech.jellyfin.fragments.LibraryFragment"
android:label="library_fragment" android:label="{libraryName}"
tools:layout="@layout/fragment_library" > tools:layout="@layout/fragment_library">
<argument <argument
android:name="libraryId" android:name="libraryId"
app:argType="java.util.UUID" /> app:argType="java.util.UUID" />
<argument
android:name="libraryName"
android:defaultValue="Library"
app:argType="string"
app:nullable="true" />
</fragment> </fragment>
</navigation> </navigation>