Aggiornato style AppBar

This commit is contained in:
Giuseppe Scorrano 2025-10-01 14:45:25 +02:00
parent c16f5c1747
commit 172a8256b6
2 changed files with 8 additions and 31 deletions

View File

@ -13,17 +13,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<!--<it.integry.plugins.waterfalltoolbar.WaterfallToolbar-->
<!--android:id="@+id/waterfall_toolbar"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content">-->
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:gravity="center_horizontal" android:gravity="center_horizontal">
app:popupTheme="@style/AppTheme.PopupOverlay">
<LinearLayout <LinearLayout
android:id="@+id/toolbar_title_centered_layout" android:id="@+id/toolbar_title_centered_layout"
@ -45,7 +39,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/integry" android:text="@string/integry"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
style="@style/AppTheme.NewMaterial.Text.ToolbarTitle" style="@style/TextAppearance.Material3.TitleLarge"
android:layout_gravity="center"/> android:layout_gravity="center"/>
</LinearLayout> </LinearLayout>
@ -59,7 +53,7 @@
android:visibility="gone" android:visibility="gone"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:gravity="start" android:gravity="start"
style="@style/AppTheme.NewMaterial.Text.ToolbarTitle"/> style="@style/TextAppearance.Material3.TitleLarge"/>
<androidx.appcompat.widget.SearchView <androidx.appcompat.widget.SearchView
android:id="@+id/main_search" android:id="@+id/main_search"
@ -69,37 +63,32 @@
app:defaultQueryHint="@string/search" app:defaultQueryHint="@string/search"
app:iconifiedByDefault="true" app:iconifiedByDefault="true"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"/>
android:tint="@android:color/black"/>
<androidx.appcompat.widget.AppCompatImageButton <androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/main_filter" android:id="@+id/main_filter"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_gravity="end" android:layout_gravity="end"
android:background="@android:color/transparent" android:background="?attr/selectableItemBackground"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:visibility="gone" android:visibility="gone"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:src="@drawable/ic_search_black_24dp" android:src="@drawable/ic_search_black_24dp"/>
android:tint="@android:color/black"/>
<androidx.appcompat.widget.AppCompatImageButton <androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/main_select_all" android:id="@+id/main_select_all"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_gravity="end" android:layout_gravity="end"
android:background="@android:color/transparent" android:background="?attr/selectableItemBackground"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:visibility="gone" android:visibility="gone"
android:layout_toStartOf="@id/main_filter" android:layout_toStartOf="@id/main_filter"
android:src="@drawable/ic_round_check_24" android:src="@drawable/ic_round_check_24"/>
android:tint="@android:color/black"/>
</androidx.appcompat.widget.Toolbar> </androidx.appcompat.widget.Toolbar>
<!--</it.integry.plugins.waterfalltoolbar.WaterfallToolbar>-->
</it.integry.integrywmsnative.ui.ElevatedToolbar> </it.integry.integrywmsnative.ui.ElevatedToolbar>
<include layout="@layout/content_main" /> <include layout="@layout/content_main" />

View File

@ -38,18 +38,6 @@
<item name="android:textStyle">normal</item> <item name="android:textStyle">normal</item>
</style> </style>
<style name="AppTheme.NewMaterial.Text.ToolbarTitle" parent="AppTheme.NewMaterial.Text">
<item name="android:textSize">20sp</item>
<!--<item name="android:textColor">#5F6368</item>-->
<item name="android:textColor">@android:color/black</item>
</style>
<style name="AppTheme.NewMaterial.Text.ToolbarTitle.DarkActionBar" parent="AppTheme.NewMaterial.Text">
<item name="android:textSize">20sp</item>
<!--<item name="android:textColor">#5F6368</item>-->
<item name="android:textColor">@android:color/white</item>
</style>
<style name="AppTheme.NewMaterial.Text.ListDivider" parent="AppTheme.NewMaterial.Text"> <style name="AppTheme.NewMaterial.Text.ListDivider" parent="AppTheme.NewMaterial.Text">
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
<item name="android:textColor">#5F6368</item> <item name="android:textColor">#5F6368</item>