From 0af811a519223b0be67c47d8032880507d98f24b Mon Sep 17 00:00:00 2001
From: Catfriend1 <16361913+Catfriend1@users.noreply.github.com>
Date: Tue, 22 Oct 2024 00:55:59 +0200
Subject: [PATCH] Move v35-only theme declaration into the correct themes.xml

---
 app/src/main/res/values-v35/themes.xml | 25 +++++++++++++++++++++++++
 app/src/main/res/values/themes.xml     |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/values-v35/themes.xml

diff --git a/app/src/main/res/values-v35/themes.xml b/app/src/main/res/values-v35/themes.xml
new file mode 100644
index 000000000..77876b2da
--- /dev/null
+++ b/app/src/main/res/values-v35/themes.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.Syncthing.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primary_dark</item>
+        <item name="colorAccent">@color/accent</item>
+
+        <item name="textAppearanceListItemPrimary">@style/TextAppearance.Syncthing.ListItemPrimary</item>
+        <item name="textAppearanceListItemSecondary">@style/TextAppearance.Syncthing.ListItemSecondary</item>
+        <item name="textAppearanceListItemSmall">@style/TextAppearance.Syncthing.ListItemSmall</item>
+
+        <item name="windowActionModeOverlay">true</item>
+        <item name="android:listViewStyle">@style/Widget.Syncthing.ListView</item>
+        <item name="android:listDivider">@drawable/list_divider_inset</item>
+        <item name="drawerArrowStyle">@style/Widget.Syncthing.DrawerArrowToggle</item>
+
+        <item name="actionBarSize">@dimen/abc_action_bar_default_height_material</item>
+
+        <item name="spinnerStyle">@style/Widget.AppCompat.Spinner.Underlined</item>
+        <item name="android:spinnerItemStyle">@style/Widget.Syncthing.TextView.SpinnerItem</item>
+        <item name="alertDialogTheme">@style/Theme.Syncthing.Dialog</item>
+
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ca28daf86..bc704e9a3 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -24,7 +24,7 @@
         <item name="android:spinnerItemStyle">@style/Widget.Syncthing.TextView.SpinnerItem</item>
         <item name="alertDialogTheme">@style/Theme.Syncthing.Dialog</item>
 
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+        <!-- Overridden by themes-v35 -->
     </style>
 
     <style name="Theme.Syncthing" parent="Theme.Syncthing.Base">