From a23829807ca0f777ff6ae9773de688d22233f7f0 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 17 Jul 2022 07:47:58 +0200
Subject: [PATCH] Simplification

---
 .../java/eu/faircode/email/FragmentSetup.java | 44 -------------------
 app/src/main/res/layout/fragment_setup.xml    |  4 +-
 2 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index a3ebd998c5..93b95c5a7c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -915,28 +915,6 @@ public class FragmentSetup extends FragmentBase {
         boolean setup_welcome = prefs.getBoolean("setup_welcome", true);
         ibWelcome.setImageLevel(setup_welcome ? 0 /* less */ : 1 /* more */);
         grpWelcome.setVisibility(setup_welcome ? View.VISIBLE : View.GONE);
-
-        ViewGroup vwWelcome = (ViewGroup) ibWelcome.getParent();
-        if (vwWelcome == null)
-            return;
-
-        vwWelcome.post(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-                        return;
-                    Rect rect = new Rect(
-                            vwWelcome.getLeft(),
-                            ibWelcome.getTop(),
-                            vwWelcome.getRight(),
-                            ibWelcome.getBottom());
-                    vwWelcome.setTouchDelegate(new TouchDelegate(rect, ibWelcome));
-                } catch (Throwable ex) {
-                    Log.e(ex);
-                }
-            }
-        });
     }
 
     private void updateManual() {
@@ -964,28 +942,6 @@ public class FragmentSetup extends FragmentBase {
                 ? View.VISIBLE : View.GONE);
 
         grpExtra.setVisibility(setup_extra ? View.VISIBLE : View.GONE);
-
-        ViewGroup vwExtra = (ViewGroup) ibExtra.getParent();
-        if (vwExtra == null)
-            return;
-
-        vwExtra.post(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-                        return;
-                    Rect rect = new Rect(
-                            vwExtra.getLeft(),
-                            ibExtra.getTop(),
-                            vwExtra.getRight(),
-                            ibExtra.getBottom());
-                    vwExtra.setTouchDelegate(new TouchDelegate(rect, ibExtra));
-                } catch (Throwable ex) {
-                    Log.e(ex);
-                }
-            }
-        });
     }
 
     private void ensureVisible(View child) {
diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index 4709950cc5..667e4721b6 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -127,7 +127,7 @@
 
                 <ImageButton
                     android:id="@+id/ibWelcome"
-                    android:layout_width="36dp"
+                    android:layout_width="84dp"
                     android:layout_height="36dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:padding="6dp"
@@ -1075,7 +1075,7 @@
 
                 <ImageButton
                     android:id="@+id/ibExtra"
-                    android:layout_width="36dp"
+                    android:layout_width="84dp"
                     android:layout_height="36dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:padding="6dp"