LibreOffice/core
1
0
Fork 0
mirror of https://github.com/LibreOffice/core.git synced 2025-07-23 04:42:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

android: Consolidate custom themes

Browse Source 
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:
Michael Weghorn
2025-07-10 12:09:58 +02:00
parent d93a9e5868
commit 7b42e56bf9
5 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/source/res/layout/activity_document_browser.xml
View File

@ -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"

4
android/source/res/layout/activity_main.xml
View File

@ -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>

4
android/source/res/layout/toolbar_bottom.xml
View File

@ -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"

4
android/source/res/layout/toolbar_color_picker.xml
View File

@ -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"

8
android/source/res/values/themes.xml
View File

@ -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>