mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-25 17:27:00 +00:00
Code Issues Releases Wiki Activity

Small behavior improvement

Browse source
This commit is contained in:
M66B 2023-04-10 08:03:12 +02:00
parent 63c0b26fa1
commit 14b338e26f
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
View file

@ -250,13 +250,10 @@ public class FragmentQuickSetup extends FragmentBase {
btnManual.setOnClickListener(new View.OnClickListener() { btnManual.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
finish(); v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
FragmentAccount fragment = new FragmentAccount(); .putExtra("manual", true)
fragment.setArguments(new Bundle()); .putExtra("scroll", true));
FragmentTransaction fragmentTransaction = getParentFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("account");
fragmentTransaction.commit();
} }
}); });

5
app/src/main/java/eu/faircode/email/FragmentSetup.java
View file

@ -985,18 +985,23 @@ public class FragmentSetup extends FragmentBase implements SharedPreferences.OnS
} }
private void updateManual() { private void updateManual() {
boolean scroll = false;
FragmentActivity activity = getActivity(); FragmentActivity activity = getActivity();
if (activity != null) { if (activity != null) {
Intent intent = activity.getIntent(); Intent intent = activity.getIntent();
if (intent.hasExtra("manual")) { if (intent.hasExtra("manual")) {
manual = intent.getBooleanExtra("manual", false); manual = intent.getBooleanExtra("manual", false);
scroll = intent.getBooleanExtra("scroll", false);
intent.removeExtra("manual"); intent.removeExtra("manual");
intent.removeExtra("scroll");
activity.setIntent(intent); activity.setIntent(intent);
} }
} }
ibManual.setImageLevel(manual ? 0 /* less */ : 1 /* more */); ibManual.setImageLevel(manual ? 0 /* less */ : 1 /* more */);
cardManual.setVisibility(manual ? View.VISIBLE : View.GONE); cardManual.setVisibility(manual ? View.VISIBLE : View.GONE);
if (scroll)
ensureVisible(cardManual);
} }
private void updateExtra() { private void updateExtra() {