arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-11-25 17:38:13 +00:00
Code Issues Releases Wiki Activity

Continue bringing back the task list.

Browse Source
This commit is contained in:
Tom Hacohen 2017-12-11 10:51:26 +00:00
parent 23ab80acc0
commit 5ebc101ca6
6 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.java
View File

@ -67,6 +67,7 @@ import java.io.IOException;
import java.util.List;
import java.util.logging.Level;
import at.bitfire.ical4android.Task;
import at.bitfire.ical4android.TaskProvider;
import at.bitfire.vcard4android.ContactsStorageException;
import io.requery.Persistable;
@ -192,6 +193,11 @@ public class AccountActivity extends BaseActivity implements Toolbar.OnMenuItemC
info.type = CollectionInfo.Type.ADDRESS_BOOK;
startActivity(CreateCollectionActivity.newIntent(AccountActivity.this, account, info));
break;
case R.id.create_task_list:
info = new CollectionInfo();
info.type = CollectionInfo.Type.TASK_LIST;
startActivity(CreateCollectionActivity.newIntent(AccountActivity.this, account, info));
break;
}
return false;
}
@ -366,7 +372,12 @@ public class AccountActivity extends BaseActivity implements Toolbar.OnMenuItemC
info.caldav = new AccountInfo.ServiceInfo();
info.caldav.id = id;
info.caldav.refreshing = (davService != null && davService.isRefreshing(id)) ||
ContentResolver.isSyncActive(account, CalendarContract.AUTHORITY) ||
ContentResolver.isSyncActive(account, CalendarContract.AUTHORITY);
info.caldav.journals = JournalEntity.getJournals(data, serviceEntity);
} else if (service.equals(CollectionInfo.Type.TASK_LIST)) {
info.caldav = new AccountInfo.ServiceInfo();
info.caldav.id = id;
info.caldav.refreshing = (davService != null && davService.isRefreshing(id)) ||
ContentResolver.isSyncActive(account, TaskProvider.ProviderName.OpenTasks.authority);
info.caldav.journals = JournalEntity.getJournals(data, serviceEntity);
}

8
app/src/main/java/com/etesync/syncadapter/ui/CreateCollectionActivity.java
View File

@ -73,7 +73,13 @@ public class CreateCollectionActivity extends BaseActivity {
}).show();
}
});
} else {
} else if (info.type == CollectionInfo.Type.TASK_LIST) {
setTitle(R.string.create_tasklist);
displayName.setHint(R.string.create_tasklist_display_name_hint);
final View colorGroup = findViewById(R.id.color_group);
colorGroup.setVisibility(View.GONE);
} else if (info.type == CollectionInfo.Type.ADDRESS_BOOK) {
setTitle(R.string.create_addressbook);
displayName.setHint(R.string.create_addressbook_display_name_hint);

3
app/src/main/java/com/etesync/syncadapter/ui/CreateCollectionFragment.java
View File

@ -36,6 +36,7 @@ import com.etesync.syncadapter.model.JournalEntity;
import com.etesync.syncadapter.model.JournalModel;
import com.etesync.syncadapter.model.ServiceEntity;
import at.bitfire.ical4android.TaskProvider;
import io.requery.Persistable;
import io.requery.sql.EntityDataStore;
import okhttp3.HttpUrl;
@ -133,6 +134,8 @@ public class CreateCollectionFragment extends DialogFragment implements LoaderMa
authority = App.getAddressBooksAuthority();
} else if (info.type == CollectionInfo.Type.CALENDAR) {
authority = CalendarContract.AUTHORITY;
} else if (info.type == CollectionInfo.Type.TASK_LIST) {
authority = TaskProvider.ProviderName.OpenTasks.authority;
} else {
throw new IllegalArgumentException("Collection must be an address book or calendar");
}

2
app/src/main/java/com/etesync/syncadapter/ui/journalviewer/ListEntriesFragment.java
View File

@ -140,6 +140,8 @@ public class ListEntriesFragment extends ListFragment implements AdapterView.OnI
String prefix;
if (info.type == CollectionInfo.Type.CALENDAR) {
prefix = "SUMMARY:";
} else if (info.type == CollectionInfo.Type.TASK_LIST) {
prefix = "SUMMARY:";
} else {
prefix = "FN:";
}

15
app/src/main/res/menu/vtodo_actions.xml Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
~ All rights reserved. This program and the accompanying materials
~ are made available under the terms of the GNU Public License v3.0
~ which accompanies this distribution, and is available at
~ http://www.gnu.org/licenses/gpl.html
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/create_task_list"
android:title="@string/create_tasklist"/>
</menu>

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

@ -260,6 +260,8 @@
<string name="create_addressbook_display_name_hint">My Address Book</string>
<string name="create_calendar">Create calendar</string>
<string name="create_calendar_display_name_hint">My Calendar</string>
<string name="create_tasklist">Create task list</string>
<string name="create_tasklist_display_name_hint">My Task List</string>
<string name="edit_collection">Edit collection</string>
<string name="create_collection_color">Set the calendar\'s color</string>
<string name="create_collection_creating">Creating collection</string>