From 65f27c15b76248f6f9b960741684f768cb85462d Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Tue, 15 May 2018 14:31:08 +0200
Subject: [PATCH] Fixes setup crashes on certain versions
---
app/src/main/res/values-sw600dp/themes_base.xml | 4 +++-
app/src/main/res/values/themes_base.xml | 15 +++------------
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/app/src/main/res/values-sw600dp/themes_base.xml b/app/src/main/res/values-sw600dp/themes_base.xml
index 98f97ef54..6de25da01 100644
--- a/app/src/main/res/values-sw600dp/themes_base.xml
+++ b/app/src/main/res/values-sw600dp/themes_base.xml
@@ -19,7 +19,9 @@
<resources>
- <style name="Theme.SetupTheme" parent="Theme.AppTheme.Light.NoActionBar">
+ <style name="Theme.SetupTheme" parent="Theme.ChatTheme.Material_Light">
+ <item name="windowActionBar">false</item>
+ <item name="windowNoTitle">true</item>
<item name="android:windowBackground">?attr/colorPrimary</item>
</style>
</resources>
diff --git a/app/src/main/res/values/themes_base.xml b/app/src/main/res/values/themes_base.xml
index 9aed501fe..db2505afb 100644
--- a/app/src/main/res/values/themes_base.xml
+++ b/app/src/main/res/values/themes_base.xml
@@ -57,18 +57,9 @@
<style name="Theme.Base.ChatTheme.Light" parent="Theme.AppTheme.Light.NoActionBar" />
- <style name="Theme.SetupTheme" parent="Theme.AppTheme.Light.NoActionBar">
- <item name="actionBarTheme">@style/Widget.AppBarOverlay</item>
- <item name="actionBarPopupTheme">@style/Widget.PopupOverlay.Light</item>
-
- <item name="colorTextPrimary">#ffffffff</item>
- <item name="colorTextPrimaryInverse">#de000000</item>
- <item name="colorTextSecondary">#b3ffffff</item>
- <item name="colorTextSecondaryInverse">#8a000000</item>
- <item name="colorDivider">#1FFFFFFF</item>
- <item name="android:textColorHint">?colorTextSecondary</item>
-
- <item name="colorBackground">#FAFAFA</item>
+ <style name="Theme.SetupTheme" parent="Theme.ChatTheme.Material_Light">
+ <item name="windowActionBar">false</item>
+ <item name="windowNoTitle">true</item>
</style>
<style name="Theme.SplashTheme" parent="Theme.AppTheme.Light.NoActionBar">
--
GitLab