msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Collapse extra card by default

Browse Source
pull/207/head
M66B 3 years ago
parent 585158db0a
commit cf2728b8f0
2 changed files with 77 additions and 26 deletions
Show Stats Download Patch File Download Diff File

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

@ -81,9 +81,9 @@ public class FragmentSetup extends FragmentBase {
private Button btnQuick;
private TextView tvQuickNew;
private CardView cardManual;
private ImageButton ibManual;
private TextView tvManual;
private CardView cardManual;
private Button btnAccount;
private Button btnIdentity;
@ -110,14 +110,17 @@ public class FragmentSetup extends FragmentBase {
private TextView tvBatteryUsage;
private TextView tvSyncStopped;
private CardView cardExtra;
private Button btnApp;
private Button btnDelete;
private Button btnMore;
private Button btnSupport;
private ImageButton ibExtra;
private Group grpBackgroundRestricted;
private Group grpDataSaver;
private Group grpSupport;
private Group grpExtra;
private int textColorPrimary;
private int colorWarning;
@ -151,9 +154,9 @@ public class FragmentSetup extends FragmentBase {
btnQuick = view.findViewById(R.id.btnQuick);
tvQuickNew = view.findViewById(R.id.tvQuickNew);
cardManual = view.findViewById(R.id.cardManual);
ibManual = view.findViewById(R.id.ibManual);
tvManual = view.findViewById(R.id.tvManual);
cardManual = view.findViewById(R.id.cardManual);
btnAccount = view.findViewById(R.id.btnAccount);
btnIdentity = view.findViewById(R.id.btnIdentity);
@ -180,14 +183,17 @@ public class FragmentSetup extends FragmentBase {
tvBatteryUsage = view.findViewById(R.id.tvBatteryUsage);
tvSyncStopped = view.findViewById(R.id.tvSyncStopped);
cardExtra = view.findViewById(R.id.cardExtra);
btnApp = view.findViewById(R.id.btnApp);
btnDelete = view.findViewById(R.id.btnDelete);
btnMore = view.findViewById(R.id.btnMore);
btnSupport = view.findViewById(R.id.btnSupport);
ibExtra = view.findViewById(R.id.ibExtra);
grpBackgroundRestricted = view.findViewById(R.id.grpBackgroundRestricted);
grpDataSaver = view.findViewById(R.id.grpDataSaver);
grpSupport = view.findViewById(R.id.grpSupport);
grpExtra = view.findViewById(R.id.grpExtra);
// Wire controls
@ -374,26 +380,7 @@ public class FragmentSetup extends FragmentBase {
manual = !manual;
updateManual();
if (manual)
view.post(new Runnable() {
@Override
public void run() {
try {
Rect rect = new Rect();
cardManual.getDrawingRect(rect);
view.offsetDescendantRectToMyCoords(cardManual, rect);
int vh = view.getHeight();
int ch = rect.height();
if (vh > 0 && ch > 0) {
int y = rect.top - (vh - ch);
if (y > 0 && view instanceof ScrollView)
((ScrollView) view).scrollTo(0, y);
}
} catch (Throwable ex) {
Log.e(ex);
}
}
});
ensureVisible(cardManual);
}
});
@ -528,6 +515,20 @@ public class FragmentSetup extends FragmentBase {
}
});
updateExtra();
ibExtra.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(v.getContext());
boolean setup_extra = !prefs.getBoolean("setup_extra", false);
prefs.edit().putBoolean("setup_extra", setup_extra).apply();
updateExtra();
if (setup_extra)
ensureVisible(cardExtra);
}
});
PackageManager pm = getContext().getPackageManager();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
@ -592,9 +593,6 @@ public class FragmentSetup extends FragmentBase {
}
});
grpSupport.setVisibility(
Helper.hasValidFingerprint(getContext()) || BuildConfig.DEBUG
? View.VISIBLE : View.GONE);
btnSupport.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -793,6 +791,41 @@ public class FragmentSetup extends FragmentBase {
cardManual.setVisibility(manual ? View.VISIBLE : View.GONE);
}
private void updateExtra() {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
boolean setup_extra = prefs.getBoolean("setup_extra", false);
ibExtra.setImageLevel(setup_extra ? 0 /* less */ : 1 /* more */);
grpSupport.setVisibility(setup_extra &&
(Helper.hasValidFingerprint(getContext()) || BuildConfig.DEBUG)
? View.VISIBLE : View.GONE);
grpExtra.setVisibility(setup_extra ? View.VISIBLE : View.GONE);
}
private void ensureVisible(View child) {
view.post(new Runnable() {
@Override
public void run() {
try {
Rect rect = new Rect();
child.getDrawingRect(rect);
view.offsetDescendantRectToMyCoords(child, rect);
int vh = view.getHeight();
int ch = rect.height();
if (vh > 0 && ch > 0) {
int y = rect.top - (vh - ch);
if (y > 0 && view instanceof ScrollView)
view.scrollTo(0, y);
}
} catch (Throwable ex) {
Log.e(ex);
}
}
});
}
@Override
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);

20
app/src/main/res/layout/fragment_setup.xml
Unescape View File

@ -956,11 +956,29 @@
app:layout_constraintTop_toTopOf="@id/btnSupport"
app:srcCompat="@drawable/twotone_open_in_new_24" />
<eu.faircode.email.FixedImageButton
android:id="@+id/ibExtra"
android:layout_width="36dp"
android:layout_height="36dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:padding="6dp"
android:scaleType="fitCenter"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnSupport"
app:srcCompat="@drawable/expander" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpSupport"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="tvSupportHint,btnSupport" />
app:constraint_referenced_ids="tvSupportHint,btnSupport,ivExternal" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpExtra"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="btnApp,btnDelete,btnMore" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>

Write Preview
Loading…
Cancel
Save