Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-27 11:16:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Select calendar improvements

Browse Source
This commit is contained in:
M66B
2022-11-02 06:59:05 +01:00
parent 2cc7b01296
commit d06743da43
4 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/faircode/email/FragmentAccount.java
View File

@@ -164,6 +164,7 @@ public class FragmentAccount extends FragmentBase {
private Group grpServer;
private Group grpAuthorize;
private Group grpCalendar;
private Group grpAdvanced;
private Group grpFolders;
private Group grpError;
@@ -279,6 +280,7 @@ public class FragmentAccount extends FragmentBase {
grpServer = view.findViewById(R.id.grpServer);
grpAuthorize = view.findViewById(R.id.grpAuthorize);
grpCalendar = view.findViewById(R.id.grpCalendar);
grpAdvanced = view.findViewById(R.id.grpAdvanced);
grpFolders = view.findViewById(R.id.grpFolders);
grpError = view.findViewById(R.id.grpError);
@@ -294,6 +296,7 @@ public class FragmentAccount extends FragmentBase {
? View.VISIBLE : View.GONE);
grpServer.setVisibility(position > 0 ? View.VISIBLE : View.GONE);
grpAuthorize.setVisibility(position > 0 ? View.VISIBLE : View.GONE);
grpCalendar.setVisibility(position > 0 && !BuildConfig.PLAY_STORE_RELEASE ? View.VISIBLE : View.GONE);
btnAdvanced.setVisibility(position > 0 ? View.VISIBLE : View.GONE);
if (position == 0)
@@ -437,7 +440,6 @@ public class FragmentAccount extends FragmentBase {
}
});
btnCalendar.setVisibility(BuildConfig.PLAY_STORE_RELEASE ? View.GONE : View.VISIBLE);
btnCalendar.setEnabled(Helper.hasPermission(getContext(), Manifest.permission.WRITE_CALENDAR));
btnCalendar.setOnClickListener(new View.OnClickListener() {
@Override
@@ -625,6 +627,7 @@ public class FragmentAccount extends FragmentBase {
grpServer.setVisibility(View.GONE);
grpAuthorize.setVisibility(View.GONE);
grpCalendar.setVisibility(View.GONE);
grpAdvanced.setVisibility(View.GONE);
grpFolders.setVisibility(View.GONE);
grpError.setVisibility(View.GONE);

3
app/src/main/java/eu/faircode/email/FragmentDialogCalendar.java
View File

@@ -76,7 +76,8 @@ public class FragmentDialogCalendar extends FragmentDialogBase {
}
AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setTitle(R.string.title_select_calendar);
builder.setIcon(R.drawable.twotone_event_24);
builder.setTitle(R.string.title_calendar);
builder.setSingleChoiceItems(names.toArray(new String[0]), checkedItem, new DialogInterface.OnClickListener() {
@Override