From 27fef56a77bfa5663deb78c25164d1cb208dfa0f Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 6 Aug 2018 12:29:14 +0000 Subject: [PATCH] Simplified setup, added debug setting --- .../java/eu/faircode/email/FragmentSetup.java | 100 ++++-------------- app/src/main/res/layout/fragment_setup.xml | 25 +---- app/src/main/res/values/strings.xml | 7 +- 3 files changed, 25 insertions(+), 107 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java index e211b8982d..02dea97d08 100644 --- a/app/src/main/java/eu/faircode/email/FragmentSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java @@ -55,9 +55,7 @@ public class FragmentSetup extends FragmentEx { private TextView tvPermissionsDone; private CheckBox cbDarkTheme; - - private Button btnAccountManage; - private Button btnIdentityManage; + private CheckBox cbDebug; private ExecutorService executor = Executors.newCachedThreadPool(); @@ -85,76 +83,25 @@ public class FragmentSetup extends FragmentEx { tvPermissionsDone = view.findViewById(R.id.tvPermissionsDone); cbDarkTheme = view.findViewById(R.id.cbDarkTheme); - - btnAccountManage = view.findViewById(R.id.btnAccountManage); - btnIdentityManage = view.findViewById(R.id.btnIdentityManage); + cbDebug = view.findViewById(R.id.cbDebug); // Wire controls btnAccount.setOnClickListener(new View.OnClickListener() { - private boolean once; - @Override public void onClick(View view) { - once = false; - btnAccount.setEnabled(false); - pbAccount.setVisibility(View.VISIBLE); - - DB.getInstance(getContext()).account().liveFirstAccount().observe(FragmentSetup.this, new Observer() { - @Override - public void onChanged(@Nullable EntityAccount account) { - if (!once) { - once = true; - - Bundle args = new Bundle(); - if (account != null) - args.putLong("id", account.id); - - FragmentAccount fragment = new FragmentAccount(); - fragment.setArguments(args); - - FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); - fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("account"); - fragmentTransaction.commit(); - - btnAccount.setEnabled(true); - pbAccount.setVisibility(View.GONE); - } - } - }); + FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); + fragmentTransaction.replace(R.id.content_frame, new FragmentAccounts()).addToBackStack("accounts"); + fragmentTransaction.commit(); } }); btnIdentity.setOnClickListener(new View.OnClickListener() { - private boolean once; - @Override public void onClick(View view) { - once = false; - btnIdentity.setEnabled(false); - pbIdentity.setVisibility(View.VISIBLE); - - DB.getInstance(getContext()).identity().liveFirstIdentity().observe(FragmentSetup.this, new Observer() { - @Override - public void onChanged(@Nullable EntityIdentity identity) { - if (!once) { - once = true; - Bundle args = new Bundle(); - if (identity != null) - args.putLong("id", identity.id); - - FragmentIdentity fragment = new FragmentIdentity(); - fragment.setArguments(args); - - FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); - fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("identity"); - fragmentTransaction.commit(); - } - - btnIdentity.setEnabled(true); - pbIdentity.setVisibility(View.GONE); - } - }); + FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); + fragmentTransaction.replace(R.id.content_frame, new FragmentIdentities()).addToBackStack("identities"); + fragmentTransaction.commit(); } }); @@ -165,27 +112,8 @@ public class FragmentSetup extends FragmentEx { } }); - btnAccountManage.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - //getFragmentManager().popBackStack(); - FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); - fragmentTransaction.replace(R.id.content_frame, new FragmentAccounts()).addToBackStack("accounts"); - fragmentTransaction.commit(); - } - }); - - btnIdentityManage.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - //getFragmentManager().popBackStack(); - FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); - fragmentTransaction.replace(R.id.content_frame, new FragmentIdentities()).addToBackStack("identities"); - fragmentTransaction.commit(); - } - }); - final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); + String theme = prefs.getString("theme", "light"); boolean dark = "dark".equals(theme); cbDarkTheme.setTag(dark); @@ -201,6 +129,14 @@ public class FragmentSetup extends FragmentEx { } }); + cbDebug.setChecked(prefs.getBoolean("debug", false)); + cbDebug.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { + prefs.edit().putBoolean("debug", checked).apply(); + } + }); + // Initialize pbAccount.setVisibility(View.GONE); @@ -231,7 +167,7 @@ public class FragmentSetup extends FragmentEx { onRequestPermissionsResult(0, permissions, grantResults); - // Creat outbox + // Create outbox executor.submit(new Runnable() { @Override public void run() { diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml index cfa44c1594..113d52610b 100644 --- a/app/src/main/res/layout/fragment_setup.xml +++ b/app/src/main/res/layout/fragment_setup.xml @@ -62,7 +62,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" - android:text="@string/title_setup_indentity" + android:text="@string/title_setup_identity" android:textAppearance="@style/TextAppearance.AppCompat.Medium" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -146,32 +146,15 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvPermissionsDone" /> -