From c0c1cf0b7fdaea3f8cc6d9b8f1b29e61102d03cc Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 20 Apr 2018 14:03:59 +0200
Subject: [PATCH] Even more layout bugfixes

---
 .../main/res/layout/settings_aliaslist.xml    |   2 -
 .../main/res/layout/settings_ignorelist.xml   |   6 +-
 .../res/layout/settings_ignorelist_item.xml   | 110 ++++++++----------
 3 files changed, 52 insertions(+), 66 deletions(-)

diff --git a/app/src/main/res/layout/settings_aliaslist.xml b/app/src/main/res/layout/settings_aliaslist.xml
index 2b5a5e0ee..642b416af 100644
--- a/app/src/main/res/layout/settings_aliaslist.xml
+++ b/app/src/main/res/layout/settings_aliaslist.xml
@@ -9,8 +9,6 @@
     android:id="@+id/list"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="2dp"
-    android:paddingRight="2dp"
     tools:listitem="@layout/settings_aliaslist_item" />
 
   <android.support.design.widget.FloatingActionButton
diff --git a/app/src/main/res/layout/settings_ignorelist.xml b/app/src/main/res/layout/settings_ignorelist.xml
index 18dde6d18..988af7b5c 100644
--- a/app/src/main/res/layout/settings_ignorelist.xml
+++ b/app/src/main/res/layout/settings_ignorelist.xml
@@ -3,11 +3,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:layout_marginEnd="16dp"
-  android:layout_marginLeft="16dp"
-  android:layout_marginRight="16dp"
-  android:layout_marginStart="16dp">
+  android:layout_height="match_parent">
 
   <android.support.v7.widget.RecyclerView
     android:id="@+id/list"
diff --git a/app/src/main/res/layout/settings_ignorelist_item.xml b/app/src/main/res/layout/settings_ignorelist_item.xml
index eb6394710..2baa5ca0f 100644
--- a/app/src/main/res/layout/settings_ignorelist_item.xml
+++ b/app/src/main/res/layout/settings_ignorelist_item.xml
@@ -1,75 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:layout_margin="2dp"
-  app:cardBackgroundColor="?colorBackgroundCard"
-  app:cardElevation="2dp"
+  android:background="?selectableItemBackground"
+  android:focusable="true"
+  android:gravity="center_vertical"
+  android:minHeight="?listPreferredItemHeightSmall"
   tools:showIn="@layout/settings_ignorelist">
 
+  <android.support.v7.widget.AppCompatImageView
+    android:id="@+id/handle"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:paddingEnd="32dp"
+    android:paddingLeft="?listPreferredItemPaddingRight"
+    android:paddingRight="32dp"
+    android:paddingStart="?listPreferredItemPaddingRight"
+    app:srcCompat="@drawable/ic_reorder"
+    app:tint="?colorTextSecondary" />
+
   <LinearLayout
-    android:layout_width="match_parent"
+    android:layout_width="0dip"
     android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
-    android:focusable="true"
-    android:gravity="center_vertical"
-    android:minHeight="?listPreferredItemHeightSmall">
+    android:layout_weight="1"
+    android:orientation="vertical"
+    android:paddingBottom="16dp"
+    android:paddingTop="16dp">
 
-    <android.support.v7.widget.AppCompatImageView
-      android:id="@+id/handle"
+    <TextView
+      android:id="@+id/ignore_rule"
+      style="@style/Widget.RtlConformTextView"
       android:layout_width="wrap_content"
-      android:layout_height="match_parent"
-      android:layout_gravity="center_vertical"
-      android:paddingEnd="32dp"
-      android:paddingLeft="?listPreferredItemPaddingRight"
-      android:paddingRight="32dp"
-      android:paddingStart="?listPreferredItemPaddingRight"
-      app:srcCompat="@drawable/ic_reorder"
-      app:tint="?colorTextSecondary" />
-
-    <LinearLayout
-      android:layout_width="0dip"
       android:layout_height="wrap_content"
-      android:layout_weight="1"
+      android:ellipsize="marquee"
       android:orientation="vertical"
-      android:paddingBottom="16dp"
-      android:paddingTop="16dp">
-
-      <TextView
-        android:id="@+id/ignore_rule"
-        style="@style/Widget.RtlConformTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ellipsize="marquee"
-        android:orientation="vertical"
-        android:singleLine="true"
-        android:textAppearance="?android:textAppearanceMedium"
-        android:textColor="?colorTextPrimary"
-        android:textSize="16sp"
-        tools:text="SoniEx2" />
-
-      <TextView
-        android:id="@+id/scope_rule"
-        style="@style/Widget.RtlConformTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ellipsize="marquee"
-        android:singleLine="true"
-        android:textAppearance="?textAppearanceListItemSecondary"
-        android:textColor="?colorTextSecondary"
-        tools:text="#quasseldroid" />
+      android:singleLine="true"
+      android:textAppearance="?android:textAppearanceMedium"
+      android:textColor="?colorTextPrimary"
+      android:textSize="16sp"
+      tools:text="SoniEx2" />
 
-    </LinearLayout>
-
-    <android.support.v7.widget.SwitchCompat
-      android:id="@+id/toggle"
+    <TextView
+      android:id="@+id/scope_rule"
+      style="@style/Widget.RtlConformTextView"
       android:layout_width="wrap_content"
-      android:layout_height="match_parent"
-      android:paddingEnd="?listPreferredItemPaddingRight"
-      android:paddingLeft="?listPreferredItemPaddingLeft"
-      android:paddingRight="?listPreferredItemPaddingRight"
-      android:paddingStart="?listPreferredItemPaddingLeft" />
+      android:layout_height="wrap_content"
+      android:ellipsize="marquee"
+      android:singleLine="true"
+      android:textAppearance="?textAppearanceListItemSecondary"
+      android:textColor="?colorTextSecondary"
+      tools:text="#quasseldroid" />
+
   </LinearLayout>
-</android.support.v7.widget.CardView>
+
+  <android.support.v7.widget.SwitchCompat
+    android:id="@+id/toggle"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:paddingEnd="?listPreferredItemPaddingRight"
+    android:paddingLeft="?listPreferredItemPaddingLeft"
+    android:paddingRight="?listPreferredItemPaddingRight"
+    android:paddingStart="?listPreferredItemPaddingLeft" />
+</LinearLayout>
-- 
GitLab