mirror of
https://github.com/LibreOffice/core.git
synced 2025-07-23 04:42:03 +00:00
android: Consolidate custom themes
LibreOfficeTheme.Base isn't used by itself, so no longer let LibreOfficeTheme derive from it, but derive from Theme.AppCompat.DayNight.NoActionBar directly. LibreOfficeTheme.Toolbar is equivalent, so drop it and switch all uses to LibreOfficeTheme instead. Change-Id: I9ad5ccb00bac94a20c17715780050fd8d300fa15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187625 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins
This commit is contained in:
@ -19,8 +19,8 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:elevation="3dp"
|
||||
app:theme="@style/LibreOfficeTheme.Toolbar"
|
||||
tools:theme="@style/LibreOfficeTheme.Toolbar"
|
||||
app:theme="@style/LibreOfficeTheme"
|
||||
tools:theme="@style/LibreOfficeTheme"
|
||||
app:popupTheme="@style/LibreOfficeTheme"
|
||||
tools:layout_constraintTop_creator="1"
|
||||
tools:layout_constraintRight_creator="1"
|
||||
|
@ -28,8 +28,8 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:elevation="3dp"
|
||||
app:theme="@style/LibreOfficeTheme.Toolbar"
|
||||
tools:theme="@style/LibreOfficeTheme.Toolbar"
|
||||
app:theme="@style/LibreOfficeTheme"
|
||||
tools:theme="@style/LibreOfficeTheme"
|
||||
app:popupTheme="@style/LibreOfficeTheme" />
|
||||
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
|
@ -10,8 +10,8 @@
|
||||
android:background="?attr/colorPrimary"
|
||||
android:elevation="3dp"
|
||||
android:orientation="vertical"
|
||||
app:popupTheme="@style/LibreOfficeTheme.Toolbar"
|
||||
app:theme="@style/LibreOfficeTheme.Toolbar"
|
||||
app:popupTheme="@style/LibreOfficeTheme"
|
||||
app:theme="@style/LibreOfficeTheme"
|
||||
tools:showIn="@layout/activity_main"
|
||||
app:layout_behavior="@string/bottom_sheet_behavior"
|
||||
app:behavior_hideable="true"
|
||||
|
@ -9,8 +9,8 @@
|
||||
android:background="?attr/colorPrimary"
|
||||
android:elevation="3dp"
|
||||
android:orientation="vertical"
|
||||
app:popupTheme="@style/LibreOfficeTheme.Toolbar"
|
||||
app:theme="@style/LibreOfficeTheme.Toolbar"
|
||||
app:popupTheme="@style/LibreOfficeTheme"
|
||||
app:theme="@style/LibreOfficeTheme"
|
||||
tools:showIn="@layout/activity_main"
|
||||
app:layout_behavior="@string/bottom_sheet_behavior"
|
||||
app:behavior_hideable="true"
|
||||
|
@ -1,9 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
<style name="LibreOfficeTheme" parent="LibreOfficeTheme.Base"/>
|
||||
|
||||
<style name="LibreOfficeTheme.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
|
||||
</style>
|
||||
<style name="LibreOfficeTheme" parent="Theme.AppCompat.DayNight.NoActionBar"/>
|
||||
|
||||
<style name="ListItemText">
|
||||
<item name="android:gravity">center_vertical</item>
|
||||
@ -11,9 +8,6 @@
|
||||
<item name="android:textSize">14sp</item>
|
||||
</style>
|
||||
|
||||
<style name="LibreOfficeTheme.Toolbar" parent="Theme.AppCompat.DayNight.NoActionBar">
|
||||
</style>
|
||||
|
||||
<style name="NewDocumentTextView">
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
|
Reference in New Issue
Block a user