Small layout improvement

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

@@ -97,6 +97,7 @@ public class FragmentSetup extends FragmentBase implements SharedPreferences.OnS
     private ViewGroup view;
 
     private TextView tvWelcome;
+    private TextView tvFree;
     private TextView tvPrivacy;
     private TextView tvSupport;
     private ImageButton ibWelcome;
@@ -118,7 +119,6 @@ public class FragmentSetup extends FragmentBase implements SharedPreferences.OnS
     private TextView tvExchangeSupport;
     private TextView tvIdentityWhat;
     private Button btnInbox;
-    private TextView tvFree;
     private TextView tvNoComposable;
 
     private TextView tvCalendarPermissions;
@@ -194,6 +194,7 @@ public class FragmentSetup extends FragmentBase implements SharedPreferences.OnS
         // Get controls
 
         tvWelcome = view.findViewById(R.id.tvWelcome);
+        tvFree = view.findViewById(R.id.tvFree);
         tvPrivacy = view.findViewById(R.id.tvPrivacy);
         tvSupport = view.findViewById(R.id.tvSupport);
         ibWelcome = view.findViewById(R.id.ibWelcome);
@@ -215,7 +216,6 @@ public class FragmentSetup extends FragmentBase implements SharedPreferences.OnS
         tvExchangeSupport = view.findViewById(R.id.tvExchangeSupport);
         tvIdentityWhat = view.findViewById(R.id.tvIdentityWhat);
         btnInbox = view.findViewById(R.id.btnInbox);
-        tvFree = view.findViewById(R.id.tvFree);
         tvNoComposable = view.findViewById(R.id.tvNoComposable);
 
         tvCalendarPermissions = view.findViewById(R.id.tvCalendarPermissions);
@@ -273,6 +273,14 @@ public class FragmentSetup extends FragmentBase implements SharedPreferences.OnS
             }
         });
 
+        tvFree.setPaintFlags(tvFree.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+        tvFree.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Helper.viewFAQ(v.getContext(), 19);
+            }
+        });
+
         tvPrivacy.setPaintFlags(tvPrivacy.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
         tvPrivacy.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -551,14 +559,6 @@ public class FragmentSetup extends FragmentBase implements SharedPreferences.OnS
             }
         });
 
-        tvFree.setPaintFlags(tvFree.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-        tvFree.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Helper.viewFAQ(v.getContext(), 19);
-            }
-        });
-
         btnPermissions.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

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

@@ -130,6 +130,21 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/issue" />
 
+                <TextView
+                    android:id="@+id/tvFree"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:drawableEnd="@drawable/twotone_open_in_new_12"
+                    android:drawablePadding="6dp"
+                    android:text="@string/title_setup_free"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textColor="?android:attr/textColorLink"
+                    app:drawableTint="?android:attr/textColorLink"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/analytics" />
+
                 <TextView
                     android:id="@+id/tvPrivacy"
                     android:layout_width="wrap_content"
@@ -143,7 +158,7 @@
                     app:drawableTint="?android:attr/textColorLink"
                     app:layout_constraintEnd_toStartOf="@+id/tvSupport"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/analytics" />
+                    app:layout_constraintTop_toBottomOf="@id/tvFree" />
 
                 <TextView
                     android:id="@+id/tvSupport"
@@ -158,7 +173,7 @@
                     app:drawableTint="?android:attr/textColorLink"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/tvPrivacy"
-                    app:layout_constraintTop_toBottomOf="@id/analytics" />
+                    app:layout_constraintTop_toBottomOf="@id/tvFree" />
 
                 <ImageButton
                     android:id="@+id/ibWelcome"
@@ -592,21 +607,6 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvNoComposable" />
-
-                <TextView
-                    android:id="@+id/tvFree"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="18dp"
-                    android:drawableEnd="@drawable/twotone_open_in_new_12"
-                    android:drawablePadding="6dp"
-                    android:text="@string/title_setup_free"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textColor="?android:attr/textColorLink"
-                    app:drawableTint="?android:attr/textColorLink"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/btnInbox" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>