Add basic Toolbar

app/src/main/java/dev/jdtech/jellyfin/MainActivity.kt

@@ -3,8 +3,9 @@ package dev.jdtech.jellyfin
 import android.os.Bundle
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import androidx.appcompat.app.AppCompatActivity
-import androidx.navigation.findNavController
 import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.ui.AppBarConfiguration
+import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
 import dev.jdtech.jellyfin.databinding.ActivityMainBinding
 
@@ -23,7 +24,18 @@ class MainActivity : AppCompatActivity() {
         val navHostFragment =
             supportFragmentManager.findFragmentById(R.id.nav_host_fragment_activity_main) as NavHostFragment
 
+        setSupportActionBar(binding.mainToolbar)
+
         val navController = navHostFragment.navController
+
+        // Passing each menu ID as a set of Ids because each
+        // menu should be considered as top level destinations.
+        val appBarConfiguration = AppBarConfiguration(
+            setOf(
+                R.id.navigation_home, R.id.navigation_media, R.id.navigation_settings
+            )
+        )
+        setupActionBarWithNavController(navController, appBarConfiguration)
         navView.setupWithNavController(navController)
     }
 }

app/src/main/res/layout/activity_main.xml

@@ -4,8 +4,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="match_parent">
-        android:paddingTop="?attr/actionBarSize">
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/nav_view"
@@ -28,8 +27,26 @@
             app:layout_constraintBottom_toTopOf="@id/nav_view"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/main_toolbar_layout"
             app:navGraph="@navigation/main_navigation" />
 
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/main_toolbar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?android:attr/windowBackground"
+            app:layout_constraintBottom_toTopOf="@id/nav_host_fragment_activity_main"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/main_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

app/src/main/res/layout/collection_item.xml

@@ -13,8 +13,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="32dp"
         android:layout_marginHorizontal="12dp"
+        android:layout_marginBottom="32dp"
         android:orientation="vertical">
 
         <com.google.android.material.imageview.ShapeableImageView

app/src/main/res/layout/fragment_home.xml

@@ -30,6 +30,8 @@
             android:id="@+id/views_recycler_view"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:clipToPadding="false"
+            android:paddingTop="16dp"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/fragment_media.xml

@@ -13,8 +13,8 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".fragments.MediaFragment"
+        android:animateLayoutChanges="true"
-        android:animateLayoutChanges="true">
+        tools:context=".fragments.MediaFragment">
 
         <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/loading_incicator"
@@ -33,14 +33,15 @@
             android:layout_height="0dp"
             android:clipToPadding="false"
             android:paddingHorizontal="12dp"
+            android:paddingTop="16dp"
             app:collections="@{viewModel.collections}"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:itemCount="4"
             app:spanCount="@integer/collection_colums"
+            tools:itemCount="4"
             tools:listitem="@layout/collection_item" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

app/src/main/res/values-sw600dp/dimens.xml

@@ -2,6 +2,6 @@
 <resources>
     <dimen name="setup_container_width">400dp</dimen>
     <item name="server_colums" type="integer">6</item>
-    <item name="collection_colums" type="integer">3</item>
+    <item name="collection_colums" type="integer">2</item>
     <item name="recyclerview_animation_duration" type="integer">450</item>
 </resources>

app/src/main/res/values-sw720dp/dimens.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <item name="server_colums" type="integer">8</item>
-    <item name="collection_colums" type="integer">4</item>
+    <item name="collection_colums" type="integer">3</item>
 </resources>