mirror of
https://github.com/etesync/android
synced 2025-01-11 00:01:12 +00:00
Add a link to install Tasks.org (recommended tasks provider).
This commit is contained in:
parent
3103d4d42a
commit
a3b0f71c13
@ -58,6 +58,7 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe
|
|||||||
internal var listTaskDAV: ListView? = null
|
internal var listTaskDAV: ListView? = null
|
||||||
|
|
||||||
internal val openTasksPackage = "org.dmfs.tasks"
|
internal val openTasksPackage = "org.dmfs.tasks"
|
||||||
|
internal val tasksOrgPackage = "org.tasks"
|
||||||
|
|
||||||
private val onItemClickListener = AdapterView.OnItemClickListener { parent, view, position, _ ->
|
private val onItemClickListener = AdapterView.OnItemClickListener { parent, view, position, _ ->
|
||||||
val list = parent as ListView
|
val list = parent as ListView
|
||||||
@ -110,6 +111,10 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe
|
|||||||
tbTaskDAV.inflateMenu(R.menu.taskdav_actions)
|
tbTaskDAV.inflateMenu(R.menu.taskdav_actions)
|
||||||
tbTaskDAV.setOnMenuItemClickListener(this)
|
tbTaskDAV.setOnMenuItemClickListener(this)
|
||||||
tbTaskDAV.setTitle(R.string.settings_taskdav)
|
tbTaskDAV.setTitle(R.string.settings_taskdav)
|
||||||
|
if (!packageInstalled(this, tasksOrgPackage)) {
|
||||||
|
val tasksInstallMenuItem = tbTaskDAV.menu.findItem(R.id.install_tasksorg)
|
||||||
|
tasksInstallMenuItem.setVisible(true)
|
||||||
|
}
|
||||||
if (!packageInstalled(this, openTasksPackage)) {
|
if (!packageInstalled(this, openTasksPackage)) {
|
||||||
val tasksInstallMenuItem = tbTaskDAV.menu.findItem(R.id.install_opentasks)
|
val tasksInstallMenuItem = tbTaskDAV.menu.findItem(R.id.install_opentasks)
|
||||||
tasksInstallMenuItem.setVisible(true)
|
tasksInstallMenuItem.setVisible(true)
|
||||||
@ -166,6 +171,25 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun installPackage(packagename: String) {
|
||||||
|
val fdroidPackageName = "org.fdroid.fdroid"
|
||||||
|
val gplayPackageName = "com.android.vending"
|
||||||
|
val intent = Intent(Intent.ACTION_VIEW).apply {
|
||||||
|
data = Uri.parse(
|
||||||
|
"https://f-droid.org/en/packages/$packagename/")
|
||||||
|
}
|
||||||
|
if (packageInstalled(this, fdroidPackageName)) {
|
||||||
|
intent.setPackage(fdroidPackageName)
|
||||||
|
} else if (packageInstalled(this, gplayPackageName)) {
|
||||||
|
intent.apply {
|
||||||
|
data = Uri.parse(
|
||||||
|
"https://play.google.com/store/apps/details?id=$packagename")
|
||||||
|
setPackage(gplayPackageName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
startActivity(intent)
|
||||||
|
}
|
||||||
|
|
||||||
override fun onMenuItemClick(item: MenuItem): Boolean {
|
override fun onMenuItemClick(item: MenuItem): Boolean {
|
||||||
val info: CollectionInfo
|
val info: CollectionInfo
|
||||||
when (item.itemId) {
|
when (item.itemId) {
|
||||||
@ -184,23 +208,11 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe
|
|||||||
info.enumType = CollectionInfo.Type.ADDRESS_BOOK
|
info.enumType = CollectionInfo.Type.ADDRESS_BOOK
|
||||||
startActivity(CreateCollectionActivity.newIntent(this@AccountActivity, account, info))
|
startActivity(CreateCollectionActivity.newIntent(this@AccountActivity, account, info))
|
||||||
}
|
}
|
||||||
|
R.id.install_tasksorg -> {
|
||||||
|
installPackage(tasksOrgPackage)
|
||||||
|
}
|
||||||
R.id.install_opentasks -> {
|
R.id.install_opentasks -> {
|
||||||
val fdroidPackageName = "org.fdroid.fdroid"
|
installPackage(openTasksPackage)
|
||||||
val gplayPackageName = "com.android.vending"
|
|
||||||
val intent = Intent(Intent.ACTION_VIEW).apply {
|
|
||||||
data = Uri.parse(
|
|
||||||
"https://f-droid.org/en/packages/$openTasksPackage/")
|
|
||||||
}
|
|
||||||
if (packageInstalled(this, fdroidPackageName)) {
|
|
||||||
intent.setPackage(fdroidPackageName)
|
|
||||||
} else if (packageInstalled(this, gplayPackageName)) {
|
|
||||||
intent.apply {
|
|
||||||
data = Uri.parse(
|
|
||||||
"https://play.google.com/store/apps/details?id=$openTasksPackage")
|
|
||||||
setPackage(gplayPackageName)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
startActivity(intent)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
|
@ -8,6 +8,9 @@
|
|||||||
-->
|
-->
|
||||||
|
|
||||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item android:id="@+id/install_tasksorg"
|
||||||
|
android:visible="false"
|
||||||
|
android:title="@string/install_tasksorg"/>
|
||||||
|
|
||||||
<item android:id="@+id/install_opentasks"
|
<item android:id="@+id/install_opentasks"
|
||||||
android:visible="false"
|
android:visible="false"
|
||||||
|
@ -306,6 +306,7 @@
|
|||||||
<string name="create_calendar_display_name_hint">My Calendar</string>
|
<string name="create_calendar_display_name_hint">My Calendar</string>
|
||||||
<string name="create_tasklist">Create task list</string>
|
<string name="create_tasklist">Create task list</string>
|
||||||
<string name="create_tasklist_display_name_hint">My Task List</string>
|
<string name="create_tasklist_display_name_hint">My Task List</string>
|
||||||
|
<string name="install_tasksorg">Install Tasks.org</string>
|
||||||
<string name="install_opentasks">Install OpenTasks</string>
|
<string name="install_opentasks">Install OpenTasks</string>
|
||||||
<string name="edit_collection">Edit collection</string>
|
<string name="edit_collection">Edit collection</string>
|
||||||
<string name="create_collection_color">Set the collection\'s color</string>
|
<string name="create_collection_color">Set the collection\'s color</string>
|
||||||
|
Loading…
Reference in New Issue
Block a user