Merge pull request #2254 from Bnyro/master

Library fragment redesign
This commit is contained in:
Bnyro 2022-12-05 20:10:45 +01:00 committed by GitHub
commit 11d4b86129
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 110 additions and 78 deletions

View File

@ -6,102 +6,134 @@
android:layout_height="match_parent"
tools:context=".ui.fragments.LibraryFragment">
<RelativeLayout
android:id="@+id/nothing_here"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<ImageView
android:id="@+id/boogh"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_centerInParent="true"
android:layout_marginBottom="16dp"
android:src="@drawable/ic_list" />
<TextView
android:id="@+id/text_like"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/boogh"
android:layout_centerHorizontal="true"
android:layout_marginHorizontal="10dp"
android:gravity="center"
android:text="@string/emptyList"
android:textSize="20sp"
android:textStyle="bold" />
</RelativeLayout>
<com.github.libretube.ui.views.CustomSwipeToRefresh
android:id="@+id/playlist_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_margin="10dp">
<ScrollView
android:id="@+id/scrollview_playlist"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
<com.google.android.material.card.MaterialCardView
style="@style/Widget.Material3.CardView.Elevated"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_height="wrap_content">
<TextView
android:id="@+id/watch_history"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:drawablePadding="10dp"
android:paddingHorizontal="15dp"
android:paddingVertical="12dp"
android:text="@string/watch_history"
android:textSize="18sp"
android:textStyle="bold"
app:drawableStartCompat="@drawable/ic_time_outlined" />
android:orientation="vertical">
<TextView
android:id="@+id/bookmarks"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:drawablePadding="10dp"
android:paddingHorizontal="15dp"
android:paddingVertical="12dp"
android:text="@string/bookmarks"
android:textSize="18sp"
android:textStyle="bold"
app:drawableStartCompat="@drawable/ic_bookmark_outlined" />
<TextView
android:id="@+id/watch_history"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:drawablePadding="10dp"
android:paddingHorizontal="15dp"
android:paddingVertical="12dp"
android:text="@string/watch_history"
android:textSize="18sp"
android:textStyle="bold"
app:drawableStartCompat="@drawable/ic_time_outlined" />
<TextView
android:id="@+id/downloads"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:drawablePadding="10dp"
android:paddingHorizontal="15dp"
android:paddingVertical="12dp"
android:text="@string/downloads"
android:textSize="18sp"
android:textStyle="bold"
app:drawableStartCompat="@drawable/ic_download" />
<TextView
android:id="@+id/bookmarks"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:drawablePadding="10dp"
android:paddingHorizontal="15dp"
android:paddingVertical="12dp"
android:text="@string/bookmarks"
android:textSize="18sp"
android:textStyle="bold"
app:drawableStartCompat="@drawable/ic_bookmark_outlined" />
<RelativeLayout
<TextView
android:id="@+id/downloads"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:drawablePadding="10dp"
android:paddingHorizontal="15dp"
android:paddingVertical="12dp"
android:text="@string/downloads"
android:textSize="18sp"
android:textStyle="bold"
app:drawableStartCompat="@drawable/ic_download" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
style="@style/Widget.Material3.CardView.Elevated"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="10dp"
android:layout_weight="1">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:descendantFocusability="blocksDescendants">
android:orientation="vertical"
android:padding="10dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/playlist_recView"
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/playlists"
android:textSize="18sp"
android:textStyle="bold" />
<RelativeLayout
android:id="@+id/nothing_here"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:nestedScrollingEnabled="false" />
android:visibility="gone">
</RelativeLayout>
</LinearLayout>
</ScrollView>
<ImageView
android:id="@+id/listIV"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_list" />
<TextView
android:id="@+id/text_like"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/listIV"
android:layout_centerHorizontal="true"
android:gravity="center"
android:text="@string/emptyList"
android:textSize="20sp"
android:textStyle="bold" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:descendantFocusability="blocksDescendants">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/playlist_recView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:nestedScrollingEnabled="false" />
</RelativeLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout>
</com.github.libretube.ui.views.CustomSwipeToRefresh>
<com.google.android.material.floatingactionbutton.FloatingActionButton

View File

@ -178,7 +178,7 @@
<item name="android:paddingRight">6dp</item>
<item name="android:paddingTop">8dp</item>
<item name="android:paddingBottom">8dp</item>
<item name="android:background">?attr/selectableItemBackground</item>
<item name="android:background">@drawable/rounded_ripple</item>
<item name="android:orientation">horizontal</item>
</style>