mirror of https://github.com/M66B/FairEmail.git
Extra
This commit is contained in:
parent
533f103fb9
commit
e953346b41
|
@ -126,7 +126,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
|
||||||
private SwitchCompat swCleanupAttachments;
|
private SwitchCompat swCleanupAttachments;
|
||||||
private Button btnCleanup;
|
private Button btnCleanup;
|
||||||
private TextView tvLastCleanup;
|
private TextView tvLastCleanup;
|
||||||
private Button btnMore;
|
|
||||||
private SwitchCompat swProtocol;
|
private SwitchCompat swProtocol;
|
||||||
private SwitchCompat swLogInfo;
|
private SwitchCompat swLogInfo;
|
||||||
private SwitchCompat swDebug;
|
private SwitchCompat swDebug;
|
||||||
|
@ -278,7 +277,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
|
||||||
swCleanupAttachments = view.findViewById(R.id.swCleanupAttachments);
|
swCleanupAttachments = view.findViewById(R.id.swCleanupAttachments);
|
||||||
btnCleanup = view.findViewById(R.id.btnCleanup);
|
btnCleanup = view.findViewById(R.id.btnCleanup);
|
||||||
tvLastCleanup = view.findViewById(R.id.tvLastCleanup);
|
tvLastCleanup = view.findViewById(R.id.tvLastCleanup);
|
||||||
btnMore = view.findViewById(R.id.btnMore);
|
|
||||||
swProtocol = view.findViewById(R.id.swProtocol);
|
swProtocol = view.findViewById(R.id.swProtocol);
|
||||||
swLogInfo = view.findViewById(R.id.swLogInfo);
|
swLogInfo = view.findViewById(R.id.swLogInfo);
|
||||||
swDebug = view.findViewById(R.id.swDebug);
|
swDebug = view.findViewById(R.id.swDebug);
|
||||||
|
@ -646,14 +644,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
btnMore.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
|
|
||||||
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_SETUP_MORE));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
swLogInfo.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
swLogInfo.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
||||||
|
|
|
@ -113,6 +113,7 @@ public class FragmentSetup extends FragmentBase {
|
||||||
|
|
||||||
private Button btnApp;
|
private Button btnApp;
|
||||||
private Button btnDelete;
|
private Button btnDelete;
|
||||||
|
private Button btnMore;
|
||||||
private Button btnSupport;
|
private Button btnSupport;
|
||||||
|
|
||||||
private Group grpInexactAlarms;
|
private Group grpInexactAlarms;
|
||||||
|
@ -184,6 +185,7 @@ public class FragmentSetup extends FragmentBase {
|
||||||
|
|
||||||
btnApp = view.findViewById(R.id.btnApp);
|
btnApp = view.findViewById(R.id.btnApp);
|
||||||
btnDelete = view.findViewById(R.id.btnDelete);
|
btnDelete = view.findViewById(R.id.btnDelete);
|
||||||
|
btnMore = view.findViewById(R.id.btnMore);
|
||||||
btnSupport = view.findViewById(R.id.btnSupport);
|
btnSupport = view.findViewById(R.id.btnSupport);
|
||||||
|
|
||||||
grpInexactAlarms = view.findViewById(R.id.grpInexactAlarms);
|
grpInexactAlarms = view.findViewById(R.id.grpInexactAlarms);
|
||||||
|
@ -600,6 +602,14 @@ public class FragmentSetup extends FragmentBase {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
btnMore.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
|
||||||
|
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_SETUP_MORE));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
grpSupport.setVisibility(
|
grpSupport.setVisibility(
|
||||||
Helper.hasValidFingerprint(getContext()) || BuildConfig.DEBUG
|
Helper.hasValidFingerprint(getContext()) || BuildConfig.DEBUG
|
||||||
? View.VISIBLE : View.GONE);
|
? View.VISIBLE : View.GONE);
|
||||||
|
|
|
@ -497,18 +497,6 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvCleanupHint" />
|
app:layout_constraintTop_toBottomOf="@id/tvCleanupHint" />
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/btnMore"
|
|
||||||
style="?android:attr/buttonStyleSmall"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:drawableEnd="@drawable/twotone_more_horiz_24"
|
|
||||||
android:drawablePadding="6dp"
|
|
||||||
android:text="@string/title_advanced_more"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvLastCleanup" />
|
|
||||||
|
|
||||||
<androidx.appcompat.widget.SwitchCompat
|
<androidx.appcompat.widget.SwitchCompat
|
||||||
android:id="@+id/swProtocol"
|
android:id="@+id/swProtocol"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
|
@ -517,7 +505,7 @@
|
||||||
android:text="@string/title_advanced_protocol"
|
android:text="@string/title_advanced_protocol"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/btnMore"
|
app:layout_constraintTop_toBottomOf="@id/tvLastCleanup"
|
||||||
app:switchPadding="12dp" />
|
app:switchPadding="12dp" />
|
||||||
|
|
||||||
<eu.faircode.email.FixedTextView
|
<eu.faircode.email.FixedTextView
|
||||||
|
|
|
@ -919,7 +919,7 @@
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center_horizontal"
|
android:gravity="center_horizontal"
|
||||||
android:text="@string/title_advanced_more"
|
android:text="@string/title_setup_extra"
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
|
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
@ -950,6 +950,18 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/btnApp" />
|
app:layout_constraintTop_toBottomOf="@id/btnApp" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/btnMore"
|
||||||
|
style="?android:attr/buttonStyleSmall"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:drawableEnd="@drawable/twotone_more_horiz_24"
|
||||||
|
android:drawablePadding="6dp"
|
||||||
|
android:text="@string/title_advanced_more"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/btnDelete" />
|
||||||
|
|
||||||
<eu.faircode.email.FixedTextView
|
<eu.faircode.email.FixedTextView
|
||||||
android:id="@+id/tvSupportHint"
|
android:id="@+id/tvSupportHint"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
|
@ -960,7 +972,7 @@
|
||||||
android:textColor="?android:attr/textColorPrimary"
|
android:textColor="?android:attr/textColorPrimary"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/btnDelete" />
|
app:layout_constraintTop_toBottomOf="@+id/btnMore" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/btnSupport"
|
android:id="@+id/btnSupport"
|
||||||
|
@ -974,6 +986,16 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvSupportHint" />
|
app:layout_constraintTop_toBottomOf="@id/tvSupportHint" />
|
||||||
|
|
||||||
|
<eu.faircode.email.FixedImageView
|
||||||
|
android:id="@+id/ivExternal"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="6dp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@id/btnSupport"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/btnSupport"
|
||||||
|
app:layout_constraintTop_toTopOf="@id/btnSupport"
|
||||||
|
app:srcCompat="@drawable/twotone_open_in_new_24" />
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.Group
|
<androidx.constraintlayout.widget.Group
|
||||||
android:id="@+id/grpSupport"
|
android:id="@+id/grpSupport"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
|
|
|
@ -244,6 +244,7 @@
|
||||||
<string name="title_setup_error">Error</string>
|
<string name="title_setup_error">Error</string>
|
||||||
<string name="title_setup_configuring">Configuring account …</string>
|
<string name="title_setup_configuring">Configuring account …</string>
|
||||||
<string name="title_setup_app_password">You might need to use an app password</string>
|
<string name="title_setup_app_password">You might need to use an app password</string>
|
||||||
|
<string name="title_setup_extra">Extra</string>
|
||||||
|
|
||||||
<string name="title_setup_close">Close settings</string>
|
<string name="title_setup_close">Close settings</string>
|
||||||
<string name="title_setup_export">Export settings</string>
|
<string name="title_setup_export">Export settings</string>
|
||||||
|
|
Loading…
Reference in New Issue