mirror of https://github.com/M66B/FairEmail.git
Moved documentation before support
This commit is contained in:
parent
e8eb5e3f7b
commit
e3f576fde0
|
@ -70,9 +70,9 @@ public class FragmentQuickSetup extends FragmentBase {
|
||||||
|
|
||||||
private TextView tvError;
|
private TextView tvError;
|
||||||
private TextView tvErrorHint;
|
private TextView tvErrorHint;
|
||||||
|
private TextView tvInstructions;
|
||||||
private Button btnHelp;
|
private Button btnHelp;
|
||||||
private Button btnSupport;
|
private Button btnSupport;
|
||||||
private TextView tvInstructions;
|
|
||||||
|
|
||||||
private TextView tvImap;
|
private TextView tvImap;
|
||||||
private TextView tvImapFingerprint;
|
private TextView tvImapFingerprint;
|
||||||
|
@ -107,9 +107,9 @@ public class FragmentQuickSetup extends FragmentBase {
|
||||||
|
|
||||||
tvError = view.findViewById(R.id.tvError);
|
tvError = view.findViewById(R.id.tvError);
|
||||||
tvErrorHint = view.findViewById(R.id.tvErrorHint);
|
tvErrorHint = view.findViewById(R.id.tvErrorHint);
|
||||||
|
tvInstructions = view.findViewById(R.id.tvInstructions);
|
||||||
btnHelp = view.findViewById(R.id.btnHelp);
|
btnHelp = view.findViewById(R.id.btnHelp);
|
||||||
btnSupport = view.findViewById(R.id.btnSupport);
|
btnSupport = view.findViewById(R.id.btnSupport);
|
||||||
tvInstructions = view.findViewById(R.id.tvInstructions);
|
|
||||||
|
|
||||||
tvImap = view.findViewById(R.id.tvImap);
|
tvImap = view.findViewById(R.id.tvImap);
|
||||||
tvImapFingerprint = view.findViewById(R.id.tvImapFingerprint);
|
tvImapFingerprint = view.findViewById(R.id.tvImapFingerprint);
|
||||||
|
@ -202,9 +202,9 @@ public class FragmentQuickSetup extends FragmentBase {
|
||||||
pbCheck.setVisibility(View.GONE);
|
pbCheck.setVisibility(View.GONE);
|
||||||
tvPatience.setVisibility(View.GONE);
|
tvPatience.setVisibility(View.GONE);
|
||||||
pbSave.setVisibility(View.GONE);
|
pbSave.setVisibility(View.GONE);
|
||||||
btnHelp.setVisibility(View.GONE);
|
|
||||||
tvInstructions.setVisibility(View.GONE);
|
tvInstructions.setVisibility(View.GONE);
|
||||||
tvInstructions.setMovementMethod(LinkMovementMethod.getInstance());
|
tvInstructions.setMovementMethod(LinkMovementMethod.getInstance());
|
||||||
|
btnHelp.setVisibility(View.GONE);
|
||||||
btnSave.setVisibility(View.GONE);
|
btnSave.setVisibility(View.GONE);
|
||||||
grpSetup.setVisibility(View.GONE);
|
grpSetup.setVisibility(View.GONE);
|
||||||
grpError.setVisibility(View.GONE);
|
grpError.setVisibility(View.GONE);
|
||||||
|
@ -231,8 +231,8 @@ public class FragmentQuickSetup extends FragmentBase {
|
||||||
tvPatience.setVisibility(check ? View.VISIBLE : View.GONE);
|
tvPatience.setVisibility(check ? View.VISIBLE : View.GONE);
|
||||||
pbSave.setVisibility(check ? View.GONE : View.VISIBLE);
|
pbSave.setVisibility(check ? View.GONE : View.VISIBLE);
|
||||||
grpError.setVisibility(View.GONE);
|
grpError.setVisibility(View.GONE);
|
||||||
btnHelp.setVisibility(View.GONE);
|
|
||||||
tvInstructions.setVisibility(View.GONE);
|
tvInstructions.setVisibility(View.GONE);
|
||||||
|
btnHelp.setVisibility(View.GONE);
|
||||||
btnSave.setVisibility(check ? View.GONE : View.VISIBLE);
|
btnSave.setVisibility(check ? View.GONE : View.VISIBLE);
|
||||||
grpSetup.setVisibility(check ? View.GONE : View.VISIBLE);
|
grpSetup.setVisibility(check ? View.GONE : View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
@ -515,9 +515,6 @@ public class FragmentQuickSetup extends FragmentBase {
|
||||||
getMainHandler().post(new Runnable() {
|
getMainHandler().post(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
if (provider != null && provider.documentation != null)
|
|
||||||
scroll.smoothScrollTo(0, tvInstructions.getBottom());
|
|
||||||
else
|
|
||||||
scroll.smoothScrollTo(0, btnSupport.getBottom());
|
scroll.smoothScrollTo(0, btnSupport.getBottom());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -191,6 +191,17 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvErrorHint" />
|
app:layout_constraintTop_toBottomOf="@id/tvErrorHint" />
|
||||||
|
|
||||||
|
<eu.faircode.email.FixedTextView
|
||||||
|
android:id="@+id/tvInstructions"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:text="provider instructions"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
|
||||||
|
android:textColor="?android:attr/textColorPrimary"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/tvErrorRemark" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/btnSupport"
|
android:id="@+id/btnSupport"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
@ -204,7 +215,7 @@
|
||||||
android:textColor="?attr/colorInfoForeground"
|
android:textColor="?attr/colorInfoForeground"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvErrorRemark" />
|
app:layout_constraintTop_toBottomOf="@id/tvInstructions" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/btnHelp"
|
android:id="@+id/btnHelp"
|
||||||
|
@ -219,28 +230,17 @@
|
||||||
android:textColor="?attr/colorInfoForeground"
|
android:textColor="?attr/colorInfoForeground"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvErrorRemark" />
|
app:layout_constraintTop_toBottomOf="@id/tvInstructions" />
|
||||||
|
|
||||||
<eu.faircode.email.FixedTextView
|
|
||||||
android:id="@+id/tvInstructions"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:text="provider instructions"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
|
|
||||||
android:textColor="?android:attr/textColorPrimary"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/btnSupport" />
|
|
||||||
|
|
||||||
<eu.faircode.email.FixedTextView
|
<eu.faircode.email.FixedTextView
|
||||||
android:id="@+id/tvImapTitle"
|
android:id="@+id/tvImapTitle"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="12dp"
|
android:layout_marginTop="24dp"
|
||||||
android:text="@string/title_setup_quick_imap"
|
android:text="@string/title_setup_quick_imap"
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvInstructions" />
|
app:layout_constraintTop_toBottomOf="@id/btnSupport" />
|
||||||
|
|
||||||
<eu.faircode.email.FixedTextView
|
<eu.faircode.email.FixedTextView
|
||||||
android:id="@+id/tvImap"
|
android:id="@+id/tvImap"
|
||||||
|
|
Loading…
Reference in New Issue