Skip to content
Snippets Groups Projects
Commit 7d119c65 authored by Nicolas Pomepuy's avatar Nicolas Pomepuy
Browse files

Remove useless toolbar_height dimension and collapsing toolbar uniformization

parent 130108e0
No related branches found
No related tags found
1 merge request!1211Playlist: fix title missing
Pipeline #177925 failed with stage
in 19 minutes and 13 seconds
......@@ -3,7 +3,6 @@
<dimen name="info_appbar_height">300dp</dimen>
<dimen name="audio_player_cover_margin">16dp</dimen>
<dimen name="subs_dl_dialog_height">350dp</dimen>
<dimen name="toolbar_height">40dp</dimen>
<dimen name="tab_layout_height">32dp</dimen>
<dimen name="audio_item_header_padding">8dp</dimen>
<dimen name="audio_item_padding_botom">8dp</dimen>
......
......@@ -2,6 +2,5 @@
<resources>
<dimen name="subs_dl_dialog_height">448dp</dimen>
<dimen name="audio_player_seekbar_bottom_margin">32dp</dimen>
<dimen name="toolbar_height">40dp</dimen>
<dimen name="tab_layout_height">-2px</dimen>
</resources>
\ No newline at end of file
......@@ -98,7 +98,6 @@
<dimen name="default_margin_plus_audio_margin">24dp</dimen>
<dimen name="audio_player_seekbar_bottom_margin">16dp</dimen>
<dimen name="toolbar_height">40dp</dimen>
<dimen name="tab_layout_height">24dp</dimen>
<!-- Audio items -->
......
......@@ -473,7 +473,7 @@
android:windowSoftInputMode="adjustPan"/>
<activity
android:name=".gui.PlaylistActivity"
android:theme="@style/Theme.VLC"/>
android:theme="@style/Theme.VLC.NoStatus"/>
<activity
android:name=".gui.InfoActivity"
android:theme="@style/Theme.VLC.NoStatus"/>
......
......@@ -22,27 +22,30 @@
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="@dimen/info_appbar_height"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
vlc:title="@{playlist.title}"
vlc:theme="@style/Toolbar.VLC"
android:keyboardNavigationCluster="true"
tools:targetApi="O"
vlc:contentScrim="?attr/background_actionbar"
vlc:expandedTitleMarginEnd="64dp"
vlc:expandedTitleMarginStart="48dp"
vlc:expandedTitleTextAppearance="@style/TextAppearance.Design.CollapsingToolbar.Expanded.Shadow"
vlc:layout_scrollFlags="scroll|exitUntilCollapsed"
android:keyboardNavigationCluster="true"
tools:targetApi="O">
vlc:statusBarScrim="?attr/background_default"
vlc:theme="@style/Toolbar.VLC"
vlc:title="@{playlist.title}">
<ImageView
android:id="@+id/playlist_cover"
android:layout_width="match_parent"
android:layout_height="192dp"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:scaleType="centerCrop"
android:src="@{cover}"
vlc:layout_collapseMode="parallax" />
......@@ -50,7 +53,7 @@
<androidx.appcompat.widget.Toolbar
android:id="@+id/main_toolbar"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height"
android:layout_height="48dp"
vlc:navigationContentDescription="@string/abc_action_bar_up_description"
vlc:popupTheme="?attr/toolbar_popup_style"
vlc:theme="@style/Toolbar.VLC"
......
......@@ -12,7 +12,7 @@
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/main_toolbar"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height"
android:layout_height="?attr/actionBarSize"
android:keyboardNavigationCluster="true"
app:layout_scrollFlags="scroll|enterAlways|snap"
app:navigationContentDescription="@string/abc_action_bar_up_description"
......
......@@ -31,7 +31,6 @@
<item name="colorOnPrimary">@color/white</item>
<item name="colorAccent">@color/orange800</item>
<item name="windowActionModeOverlay">true</item>
<item name="actionBarSize">@dimen/toolbar_height</item>
<item name="colorOnSurface">@color/black</item>
<item name="colorControlHighlight">@color/orange800</item>
<item name="colorControlNormal">@color/grey700</item>
......@@ -165,7 +164,6 @@
<style name="Theme.VLC.Apearance.Black" parent="Theme.MaterialComponents.NoActionBar">
<item name="marginTopContent">50dp</item>
<item name="toolbar_popup_style">@style/ThemeOverlay.MaterialComponents.Dark</item>
<item name="actionBarSize">@dimen/toolbar_height</item>
<item name="android:gridViewStyle">@style/Theme.VLC.List</item>
<item name="android:expandableListViewStyle">@style/Theme.VLC.List</item>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment