Small layout improvement

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

@@ -117,9 +117,9 @@ public class FragmentSetup extends FragmentBase {
 
     private CardView cardExtra;
     private TextView tvExtra;
-    private Button btnApp;
     private Button btnNotification;
     private Button btnDelete;
+    private Button btnApp;
     private Button btnMore;
     private Button btnSupport;
     private ImageButton ibExtra;
@@ -194,9 +194,9 @@ public class FragmentSetup extends FragmentBase {
 
         cardExtra = view.findViewById(R.id.cardExtra);
         tvExtra = view.findViewById(R.id.tvExtra);
-        btnApp = view.findViewById(R.id.btnApp);
         btnNotification = view.findViewById(R.id.btnNotification);
         btnDelete = view.findViewById(R.id.btnDelete);
+        btnApp = view.findViewById(R.id.btnApp);
         btnMore = view.findViewById(R.id.btnMore);
         btnSupport = view.findViewById(R.id.btnSupport);
         ibExtra = view.findViewById(R.id.ibExtra);
@@ -617,19 +617,6 @@ public class FragmentSetup extends FragmentBase {
             }
         });
 
-        final Intent app = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-        app.setData(Uri.parse("package:" + getContext().getPackageName()));
-        btnApp.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                try {
-                    getContext().startActivity(app);
-                } catch (Throwable ex) {
-                    Helper.reportNoViewer(getContext(), app, ex);
-                }
-            }
-        });
-
         btnDelete.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -655,6 +642,19 @@ public class FragmentSetup extends FragmentBase {
             }
         });
 
+        final Intent app = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+        app.setData(Uri.parse("package:" + getContext().getPackageName()));
+        btnApp.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                try {
+                    getContext().startActivity(app);
+                } catch (Throwable ex) {
+                    Helper.reportNoViewer(getContext(), app, ex);
+                }
+            }
+        });
+
         btnMore.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

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

@@ -897,18 +897,6 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <Button
-                    android:id="@+id/btnApp"
-                    style="?android:attr/buttonStyleSmall"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:drawableEnd="@drawable/twotone_android_24"
-                    android:drawablePadding="6dp"
-                    android:text="@string/title_advanced_app"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvExtra" />
-
                 <Button
                     android:id="@+id/btnNotification"
                     style="?android:attr/buttonStyleSmall"
@@ -919,7 +907,7 @@
                     android:drawablePadding="6dp"
                     android:text="@string/title_advanced_notifications_service"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/btnApp" />
+                    app:layout_constraintTop_toBottomOf="@id/tvExtra" />
 
                 <eu.faircode.email.FixedTextView
                     android:id="@+id/tvNotificationHint"
@@ -945,6 +933,18 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvNotificationHint" />
 
+                <Button
+                    android:id="@+id/btnApp"
+                    style="?android:attr/buttonStyleSmall"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:drawableEnd="@drawable/twotone_android_24"
+                    android:drawablePadding="6dp"
+                    android:text="@string/title_advanced_app"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/btnDelete" />
+
                 <Button
                     android:id="@+id/btnMore"
                     style="?android:attr/buttonStyleSmall"
@@ -955,7 +955,7 @@
                     android:drawablePadding="6dp"
                     android:text="@string/title_advanced_more"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/btnDelete" />
+                    app:layout_constraintTop_toBottomOf="@id/btnApp" />
 
                 <eu.faircode.email.FixedTextView
                     android:id="@+id/tvSupportHint"
@@ -1013,7 +1013,7 @@
                     android:id="@+id/grpExtra"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
-                    app:constraint_referenced_ids="btnApp,btnNotification,tvNotificationHint,btnDelete,btnMore" />
+                    app:constraint_referenced_ids="btnNotification,tvNotificationHint,btnDelete,btnApp,btnMore" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>