diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 26b286656..58e2a3245 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -191,7 +191,6 @@ dependencies { implementation(libs.androidx.room) kapt(libs.androidx.room.compiler) implementation(libs.androidx.appcompat) - implementation(libs.androidx.paging) implementation(libs.bundles.markwon) debugImplementation(libs.bundles.flipper) diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt index f022a9608..3060502a0 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt @@ -31,7 +31,6 @@ import androidx.core.view.setMargins import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope -import androidx.paging.PagedList import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -143,7 +142,7 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL private val listViewModel: TaskListViewModel by viewModels() private lateinit var taskAdapter: TaskAdapter - private var recyclerAdapter: TaskListRecyclerAdapter? = null + private var recyclerAdapter: DragAndDropRecyclerAdapter? = null private lateinit var filter: Filter private var searchJob: Job? = null private lateinit var search: MenuItem @@ -317,23 +316,16 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL } private fun submitList(tasks: List) { - if (tasks is PagedList) { - if (recyclerAdapter !is PagedListRecyclerAdapter) { - setAdapter( - PagedListRecyclerAdapter( - taskAdapter, recyclerView, viewHolderFactory, this, tasks, preferences)) - return - } - } else if (recyclerAdapter !is DragAndDropRecyclerAdapter) { + if (recyclerAdapter !is DragAndDropRecyclerAdapter) { setAdapter( DragAndDropRecyclerAdapter( taskAdapter, recyclerView, viewHolderFactory, this, tasks, preferences)) - return + } else { + recyclerAdapter?.submitList(tasks) } - recyclerAdapter?.submitList(tasks) } - private fun setAdapter(adapter: TaskListRecyclerAdapter) { + private fun setAdapter(adapter: DragAndDropRecyclerAdapter) { recyclerAdapter = adapter recyclerView.adapter = adapter taskAdapter.setDataSource(adapter) @@ -368,9 +360,7 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL sortMenu.isEnabled = false sortMenu.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) } - if (preferences.usePagedQueries() - || !filter.supportsSubtasks() - || taskAdapter.supportsAstridSorting()) { + if (!filter.supportsSubtasks() || taskAdapter.supportsAstridSorting()) { menu.findItem(R.id.menu_collapse_subtasks).isVisible = false menu.findItem(R.id.menu_expand_subtasks).isVisible = false } diff --git a/app/src/main/java/org/tasks/data/TaskDao.kt b/app/src/main/java/org/tasks/data/TaskDao.kt index 53d6eceb6..ef547d860 100644 --- a/app/src/main/java/org/tasks/data/TaskDao.kt +++ b/app/src/main/java/org/tasks/data/TaskDao.kt @@ -1,6 +1,5 @@ package org.tasks.data -import androidx.paging.DataSource import androidx.room.* import androidx.sqlite.db.SimpleSQLiteQuery import com.todoroo.andlib.sql.Criterion @@ -130,9 +129,6 @@ abstract class TaskDao(private val database: Database) { @Query("SELECT EXISTS(SELECT 1 FROM tasks WHERE parent > 0 AND deleted = 0) AS hasSubtasks") abstract suspend fun getSubtaskInfo(): SubtaskInfo - @RawQuery(observedEntities = [Place::class]) - abstract fun getTaskFactory(query: SimpleSQLiteQuery): DataSource.Factory - suspend fun touch(ids: List, now: Long = currentTimeMillis()) = ids.eachChunk { internalTouch(it, now) } diff --git a/app/src/main/java/org/tasks/data/TaskListQuery.kt b/app/src/main/java/org/tasks/data/TaskListQuery.kt index ed5ddf67c..11144c01a 100644 --- a/app/src/main/java/org/tasks/data/TaskListQuery.kt +++ b/app/src/main/java/org/tasks/data/TaskListQuery.kt @@ -39,7 +39,7 @@ object TaskListQuery { getRecursiveQuery(filter, preferences) filter.supportsAstridSorting() && preferences.isAstridSort -> getNonRecursiveQuery(filter, preferences) - filter.supportsSubtasks() && subtasks.usesSubtasks() && !preferences.usePagedQueries() -> + filter.supportsSubtasks() && subtasks.usesSubtasks() -> getRecursiveQuery(filter, preferences) else -> getNonRecursiveQuery(filter, preferences) } diff --git a/app/src/main/java/org/tasks/preferences/Preferences.kt b/app/src/main/java/org/tasks/preferences/Preferences.kt index 0c1fbf3b4..dc0dbfdc9 100644 --- a/app/src/main/java/org/tasks/preferences/Preferences.kt +++ b/app/src/main/java/org/tasks/preferences/Preferences.kt @@ -530,10 +530,7 @@ class Preferences @JvmOverloads constructor( val defaultThemeColor: Int get() = getInt(R.string.p_theme_color, ColorProvider.BLUE_500) - override fun usePagedQueries(): Boolean = getBoolean(R.string.p_use_paged_queries, false) - - fun showGroupHeaders(): Boolean = - !usePagedQueries() && !getBoolean(R.string.p_disable_sort_groups, false) + fun showGroupHeaders(): Boolean = !getBoolean(R.string.p_disable_sort_groups, false) val markdown: Boolean get() = getBoolean(R.string.p_markdown, false) diff --git a/app/src/main/java/org/tasks/preferences/QueryPreferences.kt b/app/src/main/java/org/tasks/preferences/QueryPreferences.kt index 58e6e455a..9414a2da1 100644 --- a/app/src/main/java/org/tasks/preferences/QueryPreferences.kt +++ b/app/src/main/java/org/tasks/preferences/QueryPreferences.kt @@ -18,6 +18,4 @@ interface QueryPreferences { val completedTasksAtBottom: Boolean val sortCompletedByCompletionDate: Boolean - - fun usePagedQueries(): Boolean } \ No newline at end of file diff --git a/app/src/main/java/org/tasks/preferences/fragments/Advanced.kt b/app/src/main/java/org/tasks/preferences/fragments/Advanced.kt index 3914f3405..318fc61fc 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/Advanced.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/Advanced.kt @@ -9,7 +9,6 @@ import androidx.preference.SwitchPreferenceCompat import com.todoroo.astrid.dao.Database import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch -import org.tasks.LocalBroadcastManager import org.tasks.PermissionUtil import org.tasks.R import org.tasks.caldav.VtodoCache @@ -37,7 +36,6 @@ class Advanced : InjectingPreferenceFragment() { @Inject lateinit var calendarEventProvider: CalendarEventProvider @Inject lateinit var permissionRequester: FragmentPermissionRequestor @Inject lateinit var permissionChecker: PermissionChecker - @Inject lateinit var localBroadcastManager: LocalBroadcastManager @Inject lateinit var vtodoCache: VtodoCache private lateinit var calendarReminderPreference: SwitchPreferenceCompat @@ -45,12 +43,6 @@ class Advanced : InjectingPreferenceFragment() { override fun getPreferenceXml() = R.xml.preferences_advanced override suspend fun setupPreferences(savedInstanceState: Bundle?) { - findPreference(R.string.p_use_paged_queries) - .setOnPreferenceChangeListener { _: Preference?, _: Any? -> - localBroadcastManager.broadcastRefresh() - true - } - findPreference(R.string.EPr_manage_delete_completed_gcal) .setOnPreferenceClickListener { deleteCompletedEvents() diff --git a/app/src/main/java/org/tasks/preferences/fragments/TaskListPreferences.kt b/app/src/main/java/org/tasks/preferences/fragments/TaskListPreferences.kt index bcbd9c883..221afd167 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/TaskListPreferences.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/TaskListPreferences.kt @@ -1,7 +1,6 @@ package org.tasks.preferences.fragments import android.os.Bundle -import androidx.preference.SwitchPreferenceCompat import dagger.hilt.android.AndroidEntryPoint import org.tasks.R import org.tasks.injection.InjectingPreferenceFragment @@ -15,12 +14,5 @@ class TaskListPreferences : InjectingPreferenceFragment() { override fun getPreferenceXml() = R.xml.preferences_task_list - override suspend fun setupPreferences(savedInstanceState: Bundle?) { - val sortGroups = findPreference(R.string.p_disable_sort_groups) as SwitchPreferenceCompat - sortGroups.isChecked = sortGroups.isChecked || preferences.usePagedQueries() - findPreference(R.string.p_use_paged_queries).setOnPreferenceChangeListener { _, value -> - sortGroups.isChecked = value as Boolean - true - } - } + override suspend fun setupPreferences(savedInstanceState: Bundle?) {} } \ No newline at end of file diff --git a/app/src/main/java/org/tasks/tasklist/PagedListRecyclerAdapter.kt b/app/src/main/java/org/tasks/tasklist/PagedListRecyclerAdapter.kt deleted file mode 100644 index cd042b2cc..000000000 --- a/app/src/main/java/org/tasks/tasklist/PagedListRecyclerAdapter.kt +++ /dev/null @@ -1,44 +0,0 @@ -package org.tasks.tasklist - -import androidx.paging.AsyncPagedListDiffer -import androidx.paging.PagedList -import androidx.recyclerview.widget.AsyncDifferConfig -import androidx.recyclerview.widget.RecyclerView -import com.todoroo.astrid.activity.TaskListFragment -import com.todoroo.astrid.adapter.TaskAdapter -import org.tasks.data.TaskContainer -import org.tasks.preferences.Preferences - -class PagedListRecyclerAdapter( - adapter: TaskAdapter, - private val recyclerView: RecyclerView, - viewHolderFactory: ViewHolderFactory, - taskList: TaskListFragment, - list: PagedList, - preferences: Preferences -) : TaskListRecyclerAdapter(adapter, viewHolderFactory, taskList, preferences) { - - private val differ: AsyncPagedListDiffer = - AsyncPagedListDiffer(this, AsyncDifferConfig.Builder(ItemCallback()).build()) - - override fun getItem(position: Int) = differ.getItem(position) - - override fun submitList(list: List) = - differ.submitList(list as PagedList) - - override fun onMoved(fromPosition: Int, toPosition: Int) { - val recyclerViewState = recyclerView.layoutManager!!.onSaveInstanceState() - super.onMoved(fromPosition, toPosition) - recyclerView.layoutManager!!.onRestoreInstanceState(recyclerViewState) - } - - override fun dragAndDropEnabled() = false - - override fun getItemCount() = differ.itemCount - - override fun getTaskCount() = itemCount - - init { - differ.submitList(list as PagedList?) - } -} \ No newline at end of file diff --git a/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt b/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt index 20020d30e..2ad80fced 100644 --- a/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt +++ b/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt @@ -69,7 +69,6 @@ class TaskViewHolder internal constructor( setOnClickListener { onCompleteBoxClick() } } private val chipGroup: ComposeView = binding.chipGroup - private val pagedQueries: Boolean = preferences.usePagedQueries() private val alwaysDisplayFullDate: Boolean = preferences.alwaysDisplayFullDate private val showGroupHeaders = preferences.showGroupHeaders() @@ -243,7 +242,7 @@ class TaskViewHolder internal constructor( place = task.location?.place, list = task.caldav, tagsString = task.tagsString, - isSubtask = task.hasParent() && !pagedQueries, + isSubtask = task.hasParent(), isGoogleTask = task.isGoogleTask, sortByStartDate = sortByStartDate, sortByList = sortByList, diff --git a/app/src/main/java/org/tasks/ui/TaskListViewModel.kt b/app/src/main/java/org/tasks/ui/TaskListViewModel.kt index eb667fac4..c94301d89 100644 --- a/app/src/main/java/org/tasks/ui/TaskListViewModel.kt +++ b/app/src/main/java/org/tasks/ui/TaskListViewModel.kt @@ -3,19 +3,12 @@ package org.tasks.ui import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Observer import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import androidx.paging.LivePagedListBuilder -import androidx.paging.PagedList -import androidx.sqlite.db.SimpleSQLiteQuery import com.todoroo.andlib.utility.AndroidUtilities -import com.todoroo.andlib.utility.DateUtilities import com.todoroo.astrid.api.Filter import dagger.hilt.android.lifecycle.HiltViewModel -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import org.tasks.BuildConfig import org.tasks.data.SubtaskInfo import org.tasks.data.TaskContainer import org.tasks.data.TaskDao @@ -27,14 +20,13 @@ import javax.inject.Inject @HiltViewModel class TaskListViewModel @Inject constructor( private val preferences: Preferences, - private val taskDao: TaskDao) : ViewModel(), Observer> { + private val taskDao: TaskDao) : ViewModel() { private var _tasks = MutableLiveData>() val tasks: LiveData> get() = _tasks private var filter: Filter? = null private var manualSortFilter = false - private var internal: LiveData>? = null fun setFilter(filter: Filter) { manualSortFilter = (filter.supportsManualSort() && preferences.isManualSort @@ -54,22 +46,15 @@ class TaskListViewModel @Inject constructor( invalidate() } - private fun removeObserver() = internal?.removeObserver(this) - fun invalidate() { AndroidUtilities.assertMainThread() - removeObserver() if (filter == null) { return } try { - if (manualSortFilter || !preferences.usePagedQueries()) { - viewModelScope.launch { - val subtasks = taskDao.getSubtaskInfo() - performNonPagedQuery(subtasks) - } - } else { - performPagedListQuery() + viewModelScope.launch { + val subtasks = taskDao.getSubtaskInfo() + performNonPagedQuery(subtasks) } } catch (e: Exception) { Timber.e(e) @@ -80,47 +65,6 @@ class TaskListViewModel @Inject constructor( _tasks.value = taskDao.fetchTasks(subtasks) { getQuery(preferences, filter!!, it) } } - private fun performPagedListQuery() { - val queries = getQuery(preferences, filter!!, SubtaskInfo()) - if (BuildConfig.DEBUG && queries.size != 1) { - throw RuntimeException("Invalid queries") - } - val query = SimpleSQLiteQuery(queries[0]) - Timber.d("paged query: %s", query.sql) - val factory = taskDao.getTaskFactory(query) - val builder = LivePagedListBuilder(factory, PAGED_LIST_CONFIG) - val current = _tasks.value - if (current is PagedList<*>) { - val lastKey = (current as PagedList).lastKey - if (lastKey is Int) { - builder.setInitialLoadKey(lastKey as Int?) - } - } - if (BuildConfig.DEBUG) { - builder.setFetchExecutor { command: Runnable -> - viewModelScope.launch(Dispatchers.IO) { - val start = DateUtilities.now() - command.run() - Timber.d("*** paged list execution took %sms", DateUtilities.now() - start) - } - } - } - internal = builder.build() - internal!!.observeForever(this) - } - - override fun onCleared() { - removeObserver() - } - val value: List get() = _tasks.value ?: emptyList() - - override fun onChanged(taskContainers: PagedList) { - _tasks.value = taskContainers - } - - companion object { - private val PAGED_LIST_CONFIG = PagedList.Config.Builder().setPageSize(20).build() - } } \ No newline at end of file diff --git a/app/src/main/java/org/tasks/widget/WidgetPreferences.java b/app/src/main/java/org/tasks/widget/WidgetPreferences.java index a930f1912..011c4d644 100644 --- a/app/src/main/java/org/tasks/widget/WidgetPreferences.java +++ b/app/src/main/java/org/tasks/widget/WidgetPreferences.java @@ -294,11 +294,6 @@ public class WidgetPreferences implements QueryPreferences { return preferences.getSortCompletedByCompletionDate(); } - @Override - public boolean usePagedQueries() { - return preferences.usePagedQueries(); - } - @Override public void setSortMode(int sortMode) { setInt(R.string.p_widget_sort, sortMode); diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index d698a185f..e7432eebb 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -161,8 +161,6 @@ ستكون الألوان مشبعة في المظهر الداكن ستكون الألوان غير مشبعة في المظهر الداكن تعطيل مجموعات الترتيب - سيتم تعطيل مجموعات الترتيب والمهام الفرعية القابلة للطي لتحسين أداء التطبيق - تحسين الأداء القائمة الافتراضية اضف المهام الجديدة لاعلى القائمة أضف حساب diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index 07b5af059..2007c2575 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -437,7 +437,6 @@ Само днес Повече настройки Помощ и обратна връзка - Подобряване на производителността Спрямо системата днес вчера @@ -606,7 +605,6 @@ Автоматично затваряне след избор на дата и час Режим на избор на час Допълнителни настройки - За по-добра производителност сортирането на групи се изключва, а задачите се свиват Затваряне след избор от списъка със задачи Час по избор Известия на носими устройства diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index a3fb2fe6d..4284efd0f 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -502,7 +502,6 @@ Nic nedělat Zápatí Zobrazit oddělovače - Zlepšit výkon Co je nového Vybrat toto místo Vybrat místo @@ -525,7 +524,6 @@ Neplatné uživatelské jméno nebo heslo Synchronizujte své úkoly pomocí aplikace DAVx⁵ Zakázat třídící skupiny - Zakáže třídicí skupiny a rozbalitelné podúkoly a tím zlepší výkon aplikace Vytvářejí se oznámení Rozumím! Ne, děkuji diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index d5171c386..4a473abc0 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -175,9 +175,7 @@ Vælg tjeneste Opret “%s” Indtast tag - Slå sorteringsgrupper og sammenklappelige underopgaver fra for at forbedre appens ydeevne Slå sorteringsgrupper fra - Forbedr ydeevne Indtast titel Flere niveauer af underopgaver understøttes ikke af Google Tasks Skjul underopgaver diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a028b582b..cb0752fec 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -541,11 +541,9 @@ heute Astrids manuelle Sortiermethode für „Meine Aufgaben“, „Heute“ und Schlagwörter aktivieren. Diese Sortiermethode wird in einer zukünftigen Version „Meine Sortierung“ ersetzen Zuletzt betrachtete Liste öffnen - Gruppensortierung und einklappbare Teilaufgaben deaktivieren, um die Anwendungsleistung zu verbessern Listen Beim Start Sortierung nach Gruppen deaktivieren - Performance verbessern In der Liste… Manuelle Sortierung nach Astrid %s bearbeitet diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index d28096ef1..a909da5a5 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -557,8 +557,6 @@ hoy Modificado %s Creado %s - Deshabilitar grupos de clasificación y subtareas colapsables para mejorar el rendimiento de la aplicación - Mejorar el rendimiento Última lista vista abierta En lanzador Listas diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 6862ad913..3ddb65c1e 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -544,10 +544,8 @@ Zerrendak Ireki ikusitako azkenen zerrenda Abioan - Hobetu errendimendua Eskuzko Astrid ordenatzea Desgaitu taldeak ordenatzea - Desgaitu taldeak ordenatzea eta azpi-zeregin tolesgarriak aplikazioaren errendimendua hobetzeko Gaitu Astrid-eko eskuzko ordenatze modua \'Nire zereginak\', \'Gaur\', eta etiketentzako. Ordenatze modu honek \'Nire ordena\'-rekin ordezkatuko da etorkizuneko bertsio batean Berrezarri ordenatze irizpidea Bihar gauez diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index bfb897fcc..274b6ed2b 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -544,7 +544,6 @@ Sähköposti Huomenna illalla Jätä varmuuskopiointivaroitukset huomiotta, jos et tarvitse varmuuskopioita tai sinulla on oma varmuuskopiointiratkaisu - Poista lajitteluryhmät ja kokoontaitettavat osatehtävät käytöstä sovelluksen suorituskyvyn parantamiseksi %d list %d lista @@ -669,7 +668,6 @@ Sosiaalinen Täysi pääsy Tehtävät-tietokantaan Palauta järjestys - Paranna suorituskykyä Tasks kerää sijaintitietoja, jotta se voi lähettää sijaintiin perustuvia muistutuksia, vaikka sovellus olisi suljettu tai sitä ei käytettäisi. Seuraava pe Seuraava ti diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 975c8b1b0..b87475a8c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -552,8 +552,6 @@ aujourd\'hui Modifié %s Créé %s - Désactiver les groupes de tri et les sous-tâches repliables pour améliorer les performances de l\'application - Améliorer les performances Ouvrir la dernière liste consultée Au lancement Listes diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 078b1f4eb..c4705a800 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -368,7 +368,6 @@ Ou escolle unha posición Sen permisos Gootle Tasks non acepta as subtarefas a múltiples niveis - Desactivar a ordenación dos grupos e as subtarefas encollibles para mellorar o rendemento do aplicativo Sincronización basada en estándares abertos de internet Sincroniza as tarefas con Tasks.org Servizo básico que sincroniza coa túa conta de Google @@ -542,7 +541,6 @@ Novas tarefas na cima Desencoller as subtarefas Encoller as subtarefas - Mellorar o rendemento Escolle unha plataforma Sincronización con cifrado par a par Sincronización baseada en ficheiros diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index c70c7871a..dc0d2af6e 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -277,8 +277,6 @@ Sinkroniziraj tvoje zadatke s Tasks.org Upiši ime oznake Onemogući razvrstavanje po grupama - Onemogući razvrstavanje po grupama i sklapajuće podzadatke za poboljšavanje performance programa - Poboljšaj performancu Upiši naslov Google Tasks ne podržava višerazinske podzadatke Sklopi podzadatke diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 1b3fd08be..d5ef4e30e 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -539,11 +539,9 @@ tegnap holnap ma - Teljesítmény növelése Listák Utoljára használt lista megnyitása Indításkor - Sorbarendezési csoportok és összecsukható alfeladatok letiltása az app teljesítményének növelése érdekében Astrid egyéni sorbarendezés engedélyezése a \"Saját Feladatok\" és a \"Ma\" listákra illetve a címkékre. Ezt a sorbarendezési módot egy jövőbeni frissítésben fel fogja váltani a \"Saját sorrend\" Astrid egyéni sorbarendezés Sorbarendezési csoportok letiltása diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 5282e027e..f37a93cda 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -392,8 +392,6 @@ Nama pengguna dan kata sandi salah Sinkronkan tugas Anda dengan aplikasi DAVx⁵ Nonaktifkan grup sortir - Nonaktifkan grup sortir dan subtugas yang bisa diciutkan untuk meningkatkan kinerja aplikasi - Tingkatkan kinerja Apa yang Baru Perizinan hilang Menghasilkan notifikasi diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d2d689b48..1f5f9d3a9 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -508,7 +508,6 @@ Mostra il menù Nuova attività Aggiungi etichetta - Disabilita i gruppi di ordinamento e le attività secondarie per migliorare le prestazioni dell\'app Non importanti e non urgenti Non importanti e urgenti Importanti e non urgenti @@ -521,7 +520,6 @@ Chiudi automaticamente quando aperto dall\'elenco attività Elenco attività Disabilita i gruppi di ordinamento - Migliora le prestazioni Novità Nascosto Sotto il titolo diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 535d3db98..5a9476128 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -521,8 +521,6 @@ בחירת פלטפורמה נא למלא שם תגית השבתת מיון קבוצות - השבתת מיון קבוצות ותת־משימות מצטמצמות כדי לשפר את ביצועי היישומון - שיפור הביצועים תת־משימות מקוננות אינן נתמכות על ידי Google Tasks לתזמן משימה מחדש לפתוח רשימה diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ed42aaf6a..2bf26a2ad 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -597,7 +597,6 @@ 今 プラットフォームを選択 タイトルを入力 - グループの並び替えと展開式のサブタスクを無効にしてアプリのパフォーマンスを向上させます こんにちは！私は Alex です。Tasks のインディーディベロッパーです 対象の Google Play の定期購入がありません $%s/年 @@ -691,7 +690,6 @@ 詳細設定 バッテリー最適化を無効にする グループの並び替えを無効 - パフォーマンスを改善 バックグラウンド時の位置情報 平均以上 クリック時 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 7f76e1427..b29519ceb 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -556,8 +556,6 @@ 마지막으로 보던 목록 열기 DAVx⁵ 앱과 내 할일 동기화 정렬그룹 비활성화 - 앱 성능을 개선하기 위해 정렬그룹과 하위할일 보기를 비활성화합니다 - 성능 개선 기본 태그 이 요청을 처리할 앱이 없습니다 내일 밤 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 9a12f7c4c..baa44e92d 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -699,8 +699,6 @@ Sukurti „%s“ Įvesti etiketės pavadinimą Išjungti rūšiavimo grupes - Išjungti rūšiavimo grupes ir sutraukiamas antrines užduotis, kad būtų pagerintas programėlės našumas - Pagerinti našumą „Google Tasks“ nepalaiko kelių lygių antrinių užduočių Sutraukti antrines užduotis Išplėsti antrines užduotis diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index f0d7de5b4..ab14ae8b2 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -541,12 +541,10 @@ Lister Ved oppstart Liker du Tasks\? - Forbedret ytelse Hva er nytt På listen… I morgen på kvelden Skru av sorteringsgrupper - Skru av sorteringsgrupper og sammenfoldbare gjøremålssteg for å forbedre programmets ytelse Nytt gjøremål Full tilgang til Tasks-database Åpne sist viste liste diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 71198f063..2a942011a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -541,8 +541,6 @@ gisteren morgen vandaag - Schakel sorteergroepen en inklapbare subtaken uit om de prestaties van de app te verbeteren - Prestaties verbeteren Pas Astrid\'s handmatige sorteermodus toe op \'Mijn taken\', \'Vandaag\', en Labels. Deze modus wordt in een komende versie vervangen door \'Mijn volgorde\' Astrid\'s handmatig sorteren Bij het starten diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index eb164ee59..f357543f3 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -558,8 +558,6 @@ Otwórz ostatnio przeglądaną listę Przy uruchomieniu Wyłącz grupy sortowania - Wyłącz grupy sortowania oraz możliwość zwijania podzadań, aby zwiększyć wydajność aplikacji - Popraw wydajność Jutro w nocy Jutro wieczorem Na liście… diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 6065745c8..bdf975632 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -461,8 +461,6 @@ Criar \"%s\" Adicione nome da etiqueta Desabilitar ordenação em grupos - Desabilita ordenação em grupos e expansibilidade de sub-tarefas para melhorar a performance do aplicativo - Melhore a performance Adicione um título Sub-tarefas em múltiplos níveis não suportado pelo Google Tasks Recolher sub-tarefas diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index ad029d447..1e1cd5e8c 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -433,8 +433,6 @@ Ativar ordenação manual do Astrid para \'Minhas tarefas\', \'Hoje\' e etiquetas. Este modo de ordenação eventualmente será substituído por \'Minha ordenação\' numa futura atualização Ordenação manual do Astrid Ao abrir a aplicação - Desativa a ordenação de grupos e subtarefas colapsáveis para melhorar o desempenho da aplicação - Aumentar o desempenho Alterado %s Criado %s Nova tarefa diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 6f8644edd..8432308c6 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -622,8 +622,6 @@ Creați \"%s\" Introduceți numele etichetei Dezactivați grupurile de sortare - Dezactivați grupurile de sortare și subactivitățile pliabile pentru a îmbunătăți performanța aplicației - Îmbunătățirea performanței Introduceți titlul Subactivitățile pe mai multe niveluri nu sunt acceptate de Google Tasks Colapsarea subactivităților diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 48dfd8d6c..ab1ba9789 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -563,8 +563,6 @@ Открыть последний просмотренный список При запуске Отключить группы сортировки - Отключить группы сортировки и сворачиваемые подзадачи для улучшения производительности - Улучшить производительность Завтра ночью Завтра вечером В списке… diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index 5a136060d..fe57749bd 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -528,8 +528,6 @@ \"%s\" සාදන්න ටැගයේ නම ඇතුළත් කරන්න වර්ග කිරීමේ කණ්ඩායම් අක්‍රීය කරන්න - යෙදුම් ක්‍රියාකාරිත්වය වැඩි දියුණු කිරීම සඳහා වර්ග කිරීමේ කණ්ඩායම් සහ හැකිලිය හැකි උප කාර්යයන් අක්‍රීය කරන්න - කාර්ය සාධනය වැඩි දියුණු කරන්න මාතෘකාව ඇතුළත් කරන්න Google Tasks විසින් බහු මට්ටමේ උප කාර්යයන් සඳහා සහාය නොදක්වයි උප කාර්යයන් හකුළුවන්න diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 6edbc3e56..ce96a3358 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -613,7 +613,6 @@ Synkronisera dina uppgifter med Tasks.org Välj en plattform Ange taggnamn - Förbättra prestanda Deluppgifter på flera nivåer stöds inte av Google Tasks Fäll in deluppgifter Fäll ut deluppgifter @@ -641,7 +640,6 @@ %s kopierat till urklipp Använd dessa uppgifter för att konfigurera en tredjepartsapp. De ger fullständig åtkomst till ditt Tasks.org-konto, skriv inte ner dem eller dela dem med någon! Inaktivera sorteringsgrupper - Inaktivera sorteringsgrupper och hopfällbara deluppgifter för att förbättra appens prestanda Tasks samlar in platsdata för att möjliggöra platsbaserade påminnelser, även när appen är stängd eller inte används. femte Visa avdelare diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 8bc69efd8..26a0eca56 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -222,8 +222,6 @@ \"%s\" ஐ உருவாக்கவும் குறிச்சொல் பெயரை உள்ளிடவும் வரிசை குழுக்களை முடக்கு - பயன்பாட்டு செயல்திறனை மேம்படுத்த வரிசை குழுக்கள் மற்றும் மடக்கக்கூடிய துணை பணிகளை முடக்கு - செயல்திறனை மேம்படுத்தவும் தலைப்பை உள்ளிடவும் கூகிள் பணிகளால் பல நிலை துணை பணிகள் ஆதரிக்கப்படவில்லை துணை பணிகளைச் சுருக்கவும் diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 1cd0910c0..7778e9456 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -182,8 +182,6 @@ สร้าง \"%s\" ป้อนชื่อแท็ก ปิดใช้งานกลุ่มการเรียงลําดับ - ปิดใช้งานกลุ่มเรียงลําดับและงานย่อยแบบยุบได้เพื่อปรับปรุงประสิทธิภาพของแอป - ปรับปรุงประสิทธิภาพ ใส่ชื่อเรื่อง งานย่อยหลายระดับไม่ได้รับการสนับสนุนโดย Google Tasks ยุบงานย่อย diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 41b2be14b..4eb9e7184 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -541,8 +541,6 @@ dün yarın bugün - Sıra kümelerini ve açılır kapanır alt görevleri devre dışı bırakarak uygulama performansını iyileştir - Performansı iyileştir Listeler Son görülen listeyi aç Başlangıçta diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index f8f413f3e..5d03ddf30 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -599,8 +599,6 @@ Синхронізувати ваші завдання з застосунком DAVx⁵ Синхронізація на основі файлів Вимкнути групи сортування - Вимкнути групи сортування та згортання підзавдань для пришвидшення роботи застосунку - Пришвидшити роботу Що нового Tasks збирає дані геолокації, щоб активувати нагадування на основі розташування навіть коли застосунок закритий або не використовується. Нове завдання diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index 5fbf4298e..4cc415f04 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -490,7 +490,6 @@ متعلق سبسکرپسن کینسل کریں ڈریئر مینیج کریں - کارکردگی کوبہتر بنائیں عنوان لکھیں کثیر الدرجی ذیلی ٹاسکس کو گوگل ٹاسکس سپورٹ نہیں کرتا ذیلی ٹاسکس کو بند کریں @@ -515,6 +514,5 @@ \"%s\" بنائیں ٹیگ کا نام درج کریں گروپس کی ترتیب ختم کریں - گروپس کی ترتیب اور سب ٹاسکس کو ختم کر کے ایپ کی کارکردگی کو بہتر بنائیں حذف شدہ اجازتیں \ No newline at end of file diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index e50f1006e..38e63245e 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -243,8 +243,6 @@ Tạo \"%s\" Nhập tên thẻ Tắt các nhóm sắp xếp - Tắt các nhóm sắp xếp và công việc con có thể thu gọn để cải thiện hiệu năng ứng dụng - Cải thiện hiệu năng Nhập tiêu đề Các công việc con có nhiều cấp không được Google Tasks hỗ trợ Thu gọn các công việc con diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ffbfecc65..4d096382f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -531,8 +531,6 @@ 昨天 明天 今日 - 禁用排序组和可折叠子任务以改善应用程序性能 - 改善性能 列表 打开上次查看的列表 启动时 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 173e7b398..39b0464de 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -385,7 +385,6 @@ 選擇一個平臺 建立 \"%s\" 輸入標籤名稱 - 提升效能 輸入標題 收起次工作 展開副工作 diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index f669d3089..b595a1112 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -390,7 +390,6 @@ preference_screen google_tasks_add_to_top google_tasks_position_hack - disable_subtasks disable_sort_groups wearable_notifications notified_oauth_error_%1$s_%2$s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a355594c9..b39b21c2b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -527,8 +527,6 @@ File %1$s contained %2$s.\n\n Collapse subtasks Multi-level subtasks not supported by Google Tasks Enter title - Improve performance - Disable sort groups and collapsible subtasks to improve app performance Disable sort groups Enter tag name Create \"%s\" diff --git a/app/src/main/res/xml/preferences_advanced.xml b/app/src/main/res/xml/preferences_advanced.xml index 122a9e3bc..e5b05d91d 100644 --- a/app/src/main/res/xml/preferences_advanced.xml +++ b/app/src/main/res/xml/preferences_advanced.xml @@ -2,12 +2,6 @@ - - - - diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 2f3929bc7..fb30ab796 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -539,21 +539,6 @@ +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.8.20 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*) ++--- androidx.appcompat:appcompat:1.6.1 (*) -++--- androidx.paging:paging-runtime:3.1.1 -+| +--- androidx.paging:paging-common:3.1.1 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*) -+| | +--- androidx.arch.core:core-common:2.1.0 -> 2.2.0 (*) -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 -> 1.8.20 (*) -+| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2 -> 1.6.4 (*) -+| +--- androidx.paging:paging-common-ktx:3.1.1 -+| | \--- androidx.paging:paging-common:3.1.1 (*) -+| +--- androidx.lifecycle:lifecycle-livedata-ktx:2.2.0 -> 2.6.1 (*) -+| +--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 -> 2.6.1 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 -> 2.6.1 (*) -+| +--- androidx.recyclerview:recyclerview:1.2.0 -> 1.3.0 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 -> 1.8.20 (*) -+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.4 (*) -+| \--- androidx.core:core-ktx:1.2.0 -> 1.9.0 (*) ++--- io.noties.markwon:core:4.6.2 +| +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*) +| \--- com.atlassian.commonmark:commonmark:0.13.0 diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 8527b24e4..9bfcce8f8 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -696,21 +696,6 @@ +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.8.20 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*) ++--- androidx.appcompat:appcompat:1.6.1 (*) -++--- androidx.paging:paging-runtime:3.1.1 -+| +--- androidx.paging:paging-common:3.1.1 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*) -+| | +--- androidx.arch.core:core-common:2.1.0 -> 2.2.0 (*) -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 -> 1.8.20 (*) -+| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2 -> 1.6.4 (*) -+| +--- androidx.paging:paging-common-ktx:3.1.1 -+| | \--- androidx.paging:paging-common:3.1.1 (*) -+| +--- androidx.lifecycle:lifecycle-livedata-ktx:2.2.0 -> 2.6.1 (*) -+| +--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 -> 2.6.1 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 -> 2.6.1 (*) -+| +--- androidx.recyclerview:recyclerview:1.2.0 -> 1.3.0 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 -> 1.8.20 (*) -+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.4 (*) -+| \--- androidx.core:core-ktx:1.2.0 -> 1.9.0 (*) ++--- io.noties.markwon:core:4.6.2 +| +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*) +| \--- com.atlassian.commonmark:commonmark:0.13.0 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5c1c78cda..fb61fb6a8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -44,7 +44,6 @@ okhttp = "4.10.0" opentasks = "562fec5" osmdroid = "6.1.16" oss-licenses-plugin = "0.10.6" -paging = "3.1.1" persistent-cookiejar = "1.0.1" play-billing-ktx = "4.1.0" play-core-ktx = "1.8.1" @@ -81,7 +80,6 @@ androidx-junit = { module = "androidx.test.ext:junit", version.ref = "junit" } androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" } androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" } androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" } -androidx-paging = { module = "androidx.paging:paging-runtime", version.ref = "paging" } androidx-preference = { module = "androidx.preference:preference", version.ref = "preference" } androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" } androidx-room = { module = "androidx.room:room-ktx", version.ref = "room" }