From 6081876bbbb3d040a41bd42369780630403166f0 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sat, 30 Sep 2017 17:55:29 +0200
Subject: [PATCH] Trying to fix a crash w.r.t. too many levels of redirected
attrs
---
.../layout-sw600dp-land/activity_setup.xml | 4 +--
.../res/layout-sw600dp-land/setup_slide.xml | 4 +--
.../res/layout-sw600dp/activity_setup.xml | 31 +++++++------------
.../main/res/layout-sw600dp/setup_slide.xml | 4 +--
app/src/main/res/layout/setup_slide.xml | 2 +-
.../main/res/layout/widget_core_account.xml | 1 +
6 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/app/src/main/res/layout-sw600dp-land/activity_setup.xml b/app/src/main/res/layout-sw600dp-land/activity_setup.xml
index c7fa866b4..31d62bdce 100644
--- a/app/src/main/res/layout-sw600dp-land/activity_setup.xml
+++ b/app/src/main/res/layout-sw600dp-land/activity_setup.xml
@@ -14,8 +14,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|bottom"
- android:layout_marginBottom="16dp"
- android:layout_marginRight="80dp"
+ android:layout_marginBottom="24dp"
+ android:layout_marginRight="24dp"
android:tint="#ffffff"
app:backgroundTint="#8A000000"
app:elevation="0dip"
diff --git a/app/src/main/res/layout-sw600dp-land/setup_slide.xml b/app/src/main/res/layout-sw600dp-land/setup_slide.xml
index 5838900da..f28e1976b 100644
--- a/app/src/main/res/layout-sw600dp-land/setup_slide.xml
+++ b/app/src/main/res/layout-sw600dp-land/setup_slide.xml
@@ -21,8 +21,8 @@
android:layout_height="wrap_content"
android:layout_gravity="end"
android:gravity="end"
+ android:textColor="?android:attr/textColorPrimaryInverse"
android:textSize="28sp"
- android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
tools:text="Connection" />
<android.support.v4.widget.Space
@@ -36,8 +36,8 @@
android:layout_height="wrap_content"
android:layout_gravity="end"
android:gravity="end"
+ android:textColor="?android:attr/textColorSecondaryInverse"
android:textSize="16sp"
- android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse"
tools:text="First, please choose which server your core is hosted on." />
</LinearLayout>
diff --git a/app/src/main/res/layout-sw600dp/activity_setup.xml b/app/src/main/res/layout-sw600dp/activity_setup.xml
index b8b719a14..31d62bdce 100644
--- a/app/src/main/res/layout-sw600dp/activity_setup.xml
+++ b/app/src/main/res/layout-sw600dp/activity_setup.xml
@@ -9,25 +9,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
- <FrameLayout
- android:layout_width="400dp"
+ <android.support.design.widget.FloatingActionButton
+ android:id="@+id/next_button"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="bottom|center">
-
- <android.support.design.widget.FloatingActionButton
- android:id="@+id/next_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right|bottom"
- android:layout_marginBottom="16dp"
- android:layout_marginRight="16dp"
- android:tint="#ffffff"
- app:backgroundTint="#8A000000"
- app:elevation="0dip"
- app:fabSize="normal"
- app:pressedTranslationZ="0dip"
- tools:ignore="RtlHardcoded" />
-
- </FrameLayout>
+ android:layout_gravity="right|bottom"
+ android:layout_marginBottom="24dp"
+ android:layout_marginRight="24dp"
+ android:tint="#ffffff"
+ app:backgroundTint="#8A000000"
+ app:elevation="0dip"
+ app:fabSize="normal"
+ app:pressedTranslationZ="0dip"
+ tools:ignore="RtlHardcoded" />
</merge>
diff --git a/app/src/main/res/layout-sw600dp/setup_slide.xml b/app/src/main/res/layout-sw600dp/setup_slide.xml
index d04c64bc7..391f91a05 100644
--- a/app/src/main/res/layout-sw600dp/setup_slide.xml
+++ b/app/src/main/res/layout-sw600dp/setup_slide.xml
@@ -24,16 +24,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
+ android:textColor="?android:attr/textColorPrimaryInverse"
android:textSize="28sp"
- android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
tools:text="Connection" />
<TextView
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:textColor="?android:attr/textColorSecondaryInverse"
android:textSize="16sp"
- android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse"
tools:text="First, please choose which server your core is hosted on." />
</LinearLayout>
diff --git a/app/src/main/res/layout/setup_slide.xml b/app/src/main/res/layout/setup_slide.xml
index c31e16eb4..54045a751 100644
--- a/app/src/main/res/layout/setup_slide.xml
+++ b/app/src/main/res/layout/setup_slide.xml
@@ -44,8 +44,8 @@
android:layout_marginRight="48dp"
android:layout_marginStart="32dp"
android:layout_marginTop="8dp"
+ android:textColor="?android:attr/textColorSecondaryInverse"
android:textSize="16sp"
- android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse"
tools:text="First, please choose which server your core is hosted on." />
</LinearLayout>
diff --git a/app/src/main/res/layout/widget_core_account.xml b/app/src/main/res/layout/widget_core_account.xml
index e92dfe929..0a8e02ba0 100644
--- a/app/src/main/res/layout/widget_core_account.xml
+++ b/app/src/main/res/layout/widget_core_account.xml
@@ -20,6 +20,7 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center_vertical"
+ android:background="@null"
android:clickable="false" />
</LinearLayout>
--
GitLab