mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added setup reminder

This commit is contained in:
M66B 2020-04-06 19:42:09 +02:00
parent c3113d11fd
commit 32dc5fcddb
4 changed files with 170 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/eu/faircode/email/ActivitySetup.java
View File

@ -127,6 +127,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
static final int REQUEST_DONE = 6;
static final int REQUEST_IMPORT_CERTIFICATE = 7;
static final int REQUEST_OAUTH = 8;
static final int REQUEST_STILL = 9;
static final String ACTION_QUICK_GMAIL = BuildConfig.APPLICATION_ID + ".ACTION_QUICK_GMAIL";
static final String ACTION_QUICK_OAUTH = BuildConfig.APPLICATION_ID + ".ACTION_QUICK_OAUTH";

86
app/src/main/java/eu/faircode/email/FragmentSetup.java
View File

@ -20,6 +20,7 @@ package eu.faircode.email;
*/
import android.Manifest;
import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
@ -32,7 +33,9 @@ import android.net.ConnectivityManager;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.provider.Settings;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@ -48,6 +51,7 @@ import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.PopupMenu;
import androidx.constraintlayout.widget.Group;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.Observer;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.preference.PreferenceManager;
@ -279,7 +283,7 @@ public class FragmentSetup extends FragmentBase {
btnInbox.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
((FragmentBase) getParentFragment()).finish();
onExit();
}
});
@ -338,6 +342,20 @@ public class FragmentSetup extends FragmentBase {
}
}.execute(this, new Bundle(), "outbox:create");
addKeyPressedListener(new ActivityBase.IKeyPressedListener() {
@Override
public boolean onKeyPressed(KeyEvent event) {
return false;
}
@Override
public boolean onBackPressed() {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
onExit();
return true;
}
});
return view;
}
@ -437,6 +455,45 @@ public class FragmentSetup extends FragmentBase {
}
}
private void onExit() {
boolean hasPermissions = hasPermission(Manifest.permission.READ_CONTACTS);
Boolean isIgnoring = Helper.isIgnoringOptimizations(getContext());
if (hasPermissions && (isIgnoring == null || isIgnoring))
((FragmentBase) getParentFragment()).finish();
else {
FragmentDialogStill fragment = new FragmentDialogStill();
fragment.setTargetFragment(FragmentSetup.this, ActivitySetup.REQUEST_STILL);
fragment.show(getParentFragmentManager(), "setup:still");
}
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == ActivitySetup.REQUEST_STILL && resultCode != Activity.RESULT_OK)
((FragmentBase) getParentFragment()).finish();
else {
boolean hasPermissions = hasPermission(Manifest.permission.READ_CONTACTS);
Boolean isIgnoring = Helper.isIgnoringOptimizations(getContext());
final int top;
if (!hasPermissions)
top = view.findViewById(R.id.three).getTop();
else if (isIgnoring != null && !isIgnoring)
top = view.findViewById(R.id.four).getTop();
else
top = 0;
new Handler().post(new Runnable() {
@Override
public void run() {
view.scrollTo(0, top);
}
});
}
}
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
for (int i = 0; i < permissions.length; i++)
@ -476,4 +533,31 @@ public class FragmentSetup extends FragmentBase {
.create();
}
}
public static class FragmentDialogStill extends FragmentDialogBase {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_setup, null);
Group grp3 = dview.findViewById(R.id.grp3);
Group grp4 = dview.findViewById(R.id.grp4);
boolean hasPermissions = Helper.hasPermission(getContext(), Manifest.permission.READ_CONTACTS);
Boolean isIgnoring = Helper.isIgnoringOptimizations(getContext());
grp3.setVisibility(hasPermissions ? View.GONE : View.VISIBLE);
grp4.setVisibility(isIgnoring == null || isIgnoring ? View.GONE : View.VISIBLE);
return new AlertDialog.Builder(getContext())
.setView(dview)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
sendResult(Activity.RESULT_OK);
}
})
.setNegativeButton(android.R.string.cancel, null)
.create();
}
}
}

83
app/src/main/res/layout/dialog_setup.xml Normal file
View File

@ -0,0 +1,83 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="24dp"
android:scrollbarStyle="outsideOverlay">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<eu.faircode.email.FixedTextView
android:id="@+id/tvMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_setup_still"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/three"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="24dp"
android:contentDescription="3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvMessage"
app:srcCompat="@drawable/baseline_looks_3_24" />
<eu.faircode.email.FixedTextView
android:id="@+id/title3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/title_setup_permissions"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/three"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/three" />
<ImageView
android:id="@+id/four"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="24dp"
android:contentDescription="4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/three"
app:srcCompat="@drawable/baseline_looks_4_24" />
<eu.faircode.email.FixedTextView
android:id="@+id/title4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="12dp"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/title_setup_doze"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/four"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/four" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grp3"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="three,title3" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grp4"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="four,title4" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

1
app/src/main/res/values/strings.xml
View File

@ -194,6 +194,7 @@
<string name="title_setup_go">Go</string>
<string name="title_setup_to_do">To do</string>
<string name="title_setup_done">Done</string>
<string name="title_setup_still">Still to do</string>
<string name="title_setup_error">Error</string>
<string name="title_setup_export">Export settings</string>