Small layout improvement

app/src/main/java/eu/faircode/email/FragmentOptions.java

@@ -362,8 +362,8 @@ public class FragmentOptions extends FragmentBase {
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
             View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_setup, null);
             CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
+            Group grp2 = dview.findViewById(R.id.grp2);
             Group grp3 = dview.findViewById(R.id.grp3);
-            Group grp4 = dview.findViewById(R.id.grp4);
 
             cbNotAgain.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
                 @Override
@@ -376,8 +376,8 @@ public class FragmentOptions extends FragmentBase {
             boolean hasPermissions = Helper.hasPermission(getContext(), Manifest.permission.READ_CONTACTS);
             Boolean isIgnoring = Helper.isIgnoringOptimizations(getContext());
 
-            grp3.setVisibility(hasPermissions ? View.GONE : View.VISIBLE);
-            grp4.setVisibility(isIgnoring == null || isIgnoring ? View.GONE : View.VISIBLE);
+            grp2.setVisibility(hasPermissions ? View.GONE : View.VISIBLE);
+            grp3.setVisibility(isIgnoring == null || isIgnoring ? View.GONE : View.VISIBLE);
 
             return new AlertDialog.Builder(getContext())
                     .setView(dview)

app/src/main/res/layout/dialog_setup.xml

@@ -34,14 +34,12 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
-            android:ellipsize="end"
-            android:singleLine="true"
             android:text="@string/title_setup_permissions"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="@id/two"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/two" />
+            app:layout_constraintStart_toEndOf="@id/two"
+            app:layout_constraintTop_toTopOf="@id/two" />
 
         <ImageView
             android:id="@+id/three"
@@ -50,7 +48,7 @@
             android:layout_marginTop="24dp"
             android:contentDescription="3"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/two"
+            app:layout_constraintTop_toBottomOf="@id/title2"
             app:srcCompat="@drawable/twotone_looks_3_24" />
 
         <eu.faircode.email.FixedTextView
@@ -58,15 +56,12 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
-            android:layout_marginTop="12dp"
-            android:ellipsize="end"
-            android:singleLine="true"
             android:text="@string/title_setup_doze"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="@id/three"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/three" />
+            app:layout_constraintStart_toEndOf="@id/three"
+            app:layout_constraintTop_toTopOf="@+id/three" />
 
         <CheckBox
             android:id="@+id/cbNotAgain"
@@ -76,16 +71,16 @@
             android:text="@string/title_no_ask_again"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/three" />
+            app:layout_constraintTop_toBottomOf="@id/title3" />
 
         <androidx.constraintlayout.widget.Group
-            android:id="@+id/grp3"
+            android:id="@+id/grp2"
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="two,title2" />
 
         <androidx.constraintlayout.widget.Group
-            android:id="@+id/grp4"
+            android:id="@+id/grp3"
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:constraint_referenced_ids="three,title3" />