kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 00:10:32 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #5332 from Bnyro/master

Browse Source 
style: also apply new player design to landscape layout
This commit is contained in:
Bnyro 2023-12-15 15:14:59 +01:00 committed by GitHub
commit a3ed5af58f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
app/src/main/res/layout-land/fragment_player.xml
View File

@ -11,7 +11,7 @@
android:id="@+id/player_scrollView" android:id="@+id/player_scrollView"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:background="?android:attr/colorBackground" android:background="?colorSurfaceContainerLow"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/related_container" app:layout_constraintEnd_toStartOf="@id/related_container"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
@ -30,51 +30,45 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:animateLayoutChanges="true" /> android:animateLayoutChanges="true" />
<com.google.android.material.card.MaterialCardView <HorizontalScrollView
style="@style/Widget.Material3.CardView.Elevated"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="10dp" android:paddingBottom="10dp"
android:layout_marginTop="10dp" android:scrollbars="none">
android:layout_marginBottom="16dp"
app:cardCornerRadius="27dp">
<LinearLayout <LinearLayout
android:id="@+id/optionsLL" android:id="@+id/optionsLL"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:orientation="horizontal"
android:layout_marginHorizontal="8dp" android:paddingHorizontal="2dp">
android:layout_marginVertical="18dp"
android:gravity="center"
android:orientation="horizontal">
<com.github.libretube.ui.views.DrawableTextView <com.google.android.material.button.MaterialButton
android:id="@+id/relPlayer_share" android:id="@+id/relPlayer_share"
style="@style/PlayerActionsText" style="@style/PlayerActionsButton"
android:text="@string/share" android:text="@string/share"
app:drawableTopCompat="@drawable/ic_share" /> app:icon="@drawable/ic_share" />
<com.github.libretube.ui.views.DrawableTextView <com.google.android.material.button.MaterialButton
android:id="@+id/relPlayer_download" android:id="@+id/relPlayer_download"
style="@style/PlayerActionsText" style="@style/PlayerActionsButton"
android:text="@string/download" android:text="@string/download"
app:drawableTopCompat="@drawable/ic_download" /> app:icon="@drawable/ic_download" />
<com.github.libretube.ui.views.DrawableTextView <com.google.android.material.button.MaterialButton
android:id="@+id/relPlayer_background"
style="@style/PlayerActionsText"
android:text="@string/audio"
app:drawableTopCompat="@drawable/ic_headphones" />
<com.github.libretube.ui.views.DrawableTextView
android:id="@+id/relPlayer_save" android:id="@+id/relPlayer_save"
style="@style/PlayerActionsText" style="@style/PlayerActionsButton"
android:text="@string/save" android:text="@string/save"
app:drawableTopCompat="@drawable/ic_save" /> app:icon="@drawable/ic_save" />
<com.google.android.material.button.MaterialButton
android:id="@+id/relPlayer_background"
style="@style/PlayerActionsButton"
android:text="@string/audio"
app:icon="@drawable/ic_headphones" />
</LinearLayout> </LinearLayout>
</com.google.android.material.card.MaterialCardView> </HorizontalScrollView>
<LinearLayout <LinearLayout
android:id="@+id/player_channel" android:id="@+id/player_channel"
@ -125,14 +119,11 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/player_subscribe" android:id="@+id/player_subscribe"
style="@style/Widget.Material3.Button.ElevatedButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/subscribe" android:text="@string/subscribe"
android:textColor="?colorControlNormal" android:textSize="12sp" />
android:textSize="12sp"
app:cornerRadius="16dp" />
</LinearLayout> </LinearLayout>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
@ -141,26 +132,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" /> android:visibility="gone" />
<com.google.android.material.card.MaterialCardView <com.google.android.material.button.MaterialButton
android:id="@+id/comments_toggle" android:id="@+id/comments_toggle"
style="@style/Widget.Material3.CardView.Elevated" style="@style/PlayerActionsButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp" android:layout_marginHorizontal="12dp"
android:layout_marginVertical="16dp" android:layout_marginVertical="16dp"
app:cardCornerRadius="18dp">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:paddingHorizontal="8dp"
android:text="@string/comments" android:text="@string/comments"
android:textAlignment="viewStart" android:textAlignment="viewStart"
app:drawableEndCompat="@drawable/ic_arrow_up_down" /> app:drawableEndCompat="@drawable/ic_arrow_up_down" />
</com.google.android.material.card.MaterialCardView>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
@ -169,25 +151,25 @@
android:id="@+id/main_container" android:id="@+id/main_container"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:background="?attr/colorSurface" android:background="?attr/colorSurfaceContainerLow"
app:layout_constraintDimensionRatio="16:9" app:layout_constraintDimensionRatio="16:9"
app:layout_constraintWidth_percent=".55" app:layout_constraintEnd_toStartOf="@id/related_container"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/related_container" app:layout_constraintWidth_default="percent"
app:layout_constraintWidth_default="percent" /> app:layout_constraintWidth_percent=".55" />
<RelativeLayout <RelativeLayout
android:id="@+id/related_container" android:id="@+id/related_container"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
android:background="?android:colorBackground"
android:descendantFocusability="blocksDescendants" android:descendantFocusability="blocksDescendants"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/main_container" app:layout_constraintStart_toEndOf="@id/main_container"
android:background="?android:colorBackground"> app:layout_constraintTop_toTopOf="parent">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/related_rec_view" android:id="@+id/related_rec_view"
@ -207,9 +189,9 @@
android:background="@android:color/black" android:background="@android:color/black"
app:controller_layout_id="@layout/exo_styled_player_control_view" app:controller_layout_id="@layout/exo_styled_player_control_view"
app:layout_constraintBottom_toBottomOf="@id/main_container" app:layout_constraintBottom_toBottomOf="@id/main_container"
app:layout_constraintEnd_toEndOf="@id/main_container"
app:layout_constraintStart_toStartOf="@id/main_container" app:layout_constraintStart_toStartOf="@id/main_container"
app:layout_constraintTop_toTopOf="@id/main_container" app:layout_constraintTop_toTopOf="@id/main_container"
app:layout_constraintEnd_toEndOf="@id/main_container"
app:show_buffering="when_playing"> app:show_buffering="when_playing">
<com.github.libretube.ui.views.DoubleTapOverlay <com.github.libretube.ui.views.DoubleTapOverlay

4
app/src/main/res/layout/fragment_player.xml
View File

@ -135,9 +135,7 @@
android:layout_marginVertical="10dp" android:layout_marginVertical="10dp"
android:text="@string/comments" android:text="@string/comments"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textColor="?colorPrimary" app:drawableEndCompat="@drawable/ic_arrow_up_down" />
app:drawableEndCompat="@drawable/ic_arrow_up_down"
app:drawableTint="?colorPrimary" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/related_rec_view" android:id="@+id/related_rec_view"